ilios 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b3913127cb41248d1f326dd97c6fb28014e43ac9cf034c2e5f1603a84e7f4e8
-  data.tar.gz: 44e268f16d039e486dccb4186b4636f5bb8626ce3fceba6f1f8fa2ad82a00430
+  metadata.gz: bb2abef9a9a501e9a070743ccf92ed53d9bd216fff56022506293ca2ca4d7786
+  data.tar.gz: b597a82ffc531bcb6ac74a8e28994210a6455b9640944e4f75223d3419e55590
 SHA512:
-  metadata.gz: ded40a1d4c75dd8db4949ded0491bbde93213729433b4f77ed5e49f751083c15c6f1e03cdd9d91581d0f1a0dd72c48f3c924f676962dc595c7f4dfa03b04b71d
-  data.tar.gz: d197af4ed1aa3d8be0612d15f542e79bd73921b947177ba941286c9d029c678121b82c50b8f121353bafa33c22feb754c11bbde7d6649ec2be54cdec41edaab6
+  metadata.gz: 5a804a3079851d162a2e6bb1811a801c3f1fd2c3f31bbdfd87754cd5c879b06457726b3f9e6e2486ef2c82c7afdab588f57741f12b1893ea42228edcdeb07151
+  data.tar.gz: 9b330372c0499631c10f9f79a79f0d8a29f48ebefc46fe440da2c0c345193bb3e62dc508ac185d29593684659ff5fb410f60436c4fc8ad4d7cbff4c41dd6b62d

data/CHANGELOG.md

@@ -1,5 +1,23 @@
 # Change Log
 
+## 1.0.3
+
+- Return 0 from ilios_malloc_size when no size API is available
+- Add proper unblock function for nogvl_sem_wait
+- Register thread-pool slots with GC only once
+- Guard future callback dispatch against double invocation
+- Use write barriers when mutating WB_PROTECTED structs
+- Retain Statement object in async execute future
+- Update libuv to v1.52.1 (#22)
+- Remove unnecessary parentheses
+- Remove extconf_compile_commands_json from runtime dependency
+- Revert "Fix build error with -c++11-extensions"
+- Revert "Disable -Werror on macOS"
+- Disable -Werror on macOS
+- Fix build error with -c++11-extensions
+- Add workaround to avoid build error on macOS
+- Use extconf_compile_commands_json gem for clangd LSP
+
 ## 1.0.2
 
 - Fix install error with CMake 4.x

data/Gemfile

@@ -5,6 +5,7 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in ilios.gemspec
 gemspec
 
+gem 'extconf_compile_commands_json'
 gem 'minitest', '~> 5.20'
 gem 'rake', '~> 13.0'
 gem 'rake-compiler', '~> 1.2'

data/ext/ilios/cluster.c

@@ -132,7 +132,7 @@ static VALUE cluster_keyspace(VALUE self, VALUE keyspace)
     StringValue(keyspace);
 
     GET_CLUSTER(self, cassandra_cluster);
-    cassandra_cluster->keyspace = keyspace;
+    RB_OBJ_WRITE(self, &cassandra_cluster->keyspace, keyspace);
 
     return self;
 }

data/ext/ilios/extconf.rb

@@ -5,25 +5,11 @@ require 'etc'
 require 'fileutils'
 require 'mini_portile2'
 require 'mkmf'
+require 'rbconfig'
 
 have_func('malloc_usable_size')
 have_func('malloc_size')
 
-def create_compile_flags_txt
-  cppflags = $CPPFLAGS.split
-  include_flags = cppflags.select { |flag| flag.start_with?('-I') }
-  define_flags = cppflags.select { |flag| flag.start_with?('-D') } + $defs
-
-  File.open('compile_flags.txt', 'w') do |f|
-    include_flags.each { |flag| f.puts(flag) }
-    f.puts("-I#{Dir.pwd}")
-    f.puts("-I#{RbConfig::CONFIG['rubyhdrdir']}")
-    f.puts("-I#{RbConfig::CONFIG['rubyhdrdir']}/ruby/backward")
-    f.puts("-I#{RbConfig::CONFIG['rubyarchhdrdir']}")
-    define_flags.each { |flag| f.puts(flag) }
-  end
-end
-
 module LibuvInstaller
   LIBUV_INSTALL_PATH = File.expand_path('libuv')
   private_constant :LIBUV_INSTALL_PATH
@@ -90,6 +76,10 @@ module CassandraDriverInstaller
     def cmake_compile_flags
       flags = super
       flags << "-DCMAKE_POLICY_VERSION_MINIMUM='3.5'"
+      # Avoid "Unsupported compiler: AppleClang" on macOS
+      flags << '-DCMAKE_CXX_COMPILER_ID=Clang' if RUBY_PLATFORM.include?('darwin') && RbConfig::CONFIG['CC'].include?('clang')
+
+      flags
     end
   end
 
@@ -153,4 +143,9 @@ $CPPFLAGS += " #{ENV['CPPFLAGS']}"
 $LDFLAGS += " #{ENV['LDFLAGS']}"
 
 create_makefile('ilios')
-create_compile_flags_txt
+
+begin
+  require 'extconf_compile_commands_json'
+  ExtconfCompileCommandsJson.generate!
+rescue LoadError
+end

data/ext/ilios/future.c

@@ -34,6 +34,13 @@ static void future_thread_pool_init(future_thread_pool *pool)
 {
     pool->queue = rb_funcall(cSizedQueue, id_new, 1, INT2NUM(QUEUE_MAX));
     rb_gc_register_mark_object(pool->queue);
+
+    // Register each slot once. The slots stay zero (Qfalse) until a thread is
+    // assigned; re-registering on every thread (re)creation would leak entries
+    // in the global address list.
+    for (int i = 0; i < THREAD_MAX; i++) {
+        rb_gc_register_address(&pool->thread[i]);
+    }
 }
 
 static void future_thread_pool_prepare_thread(future_thread_pool *pool)
@@ -49,7 +56,6 @@ static void future_thread_pool_prepare_thread(future_thread_pool *pool)
         if (!pool->thread[i] || !RTEST(status)) {
             pool->thread[i] = rb_thread_create(future_result_yielder_thread, (void*)pool);
             rb_funcall(pool->thread[i], id_report_on_exception, 1, Qtrue);
-            rb_gc_register_address(&pool->thread[i]);
         }
     }
 }
@@ -136,10 +142,18 @@ static VALUE future_result_yielder_synchronize(VALUE future)
 
     GET_FUTURE(future, cassandra_future);
 
-    if (cass_future_error_code(cassandra_future->future) == CASS_OK) {
-        future_result_success_yield(cassandra_future);
-    } else {
-        future_result_failure_yield(cassandra_future);
+    if (!cassandra_future->yielded) {
+        if (cass_future_error_code(cassandra_future->future) == CASS_OK) {
+            if (cassandra_future->on_success_block) {
+                cassandra_future->yielded = true;
+                future_result_success_yield(cassandra_future);
+            }
+        } else {
+            if (cassandra_future->on_failure_block) {
+                cassandra_future->yielded = true;
+                future_result_failure_yield(cassandra_future);
+            }
+        }
     }
     cassandra_future->already_waited = true;
     return Qnil;
@@ -180,7 +194,7 @@ static VALUE future_result_yielder_thread(void *arg)
     return Qnil;
 }
 
-VALUE future_create(CassFuture *future, VALUE session, future_kind kind)
+VALUE future_create(CassFuture *future, VALUE session, VALUE statement, future_kind kind)
 {
     CassandraFuture *cassandra_future;
     VALUE cassandra_future_obj;
@@ -189,9 +203,11 @@ VALUE future_create(CassFuture *future, VALUE session, future_kind kind)
     cassandra_future->kind = kind;
     cassandra_future->future = future;
     cassandra_future->session_obj = session;
+    cassandra_future->statement_obj = statement;
     cassandra_future->proc_mutex = rb_mutex_new();
     uv_sem_init(&cassandra_future->sem, 0);
     cassandra_future->already_waited = false;
+    cassandra_future->yielded = false;
 
     return cassandra_future_obj;
 }
@@ -208,11 +224,13 @@ static VALUE future_on_success_synchronize(VALUE future)
         wakeup_thread = true;
     }
 
-    cassandra_future->on_success_block = rb_block_proc();
+    RB_OBJ_WRITE(future, &cassandra_future->on_success_block, rb_block_proc());
 
     if (cass_future_ready(cassandra_future->future)) {
         uv_sem_post(&cassandra_future->sem);
-        if (cass_future_error_code(cassandra_future->future) == CASS_OK) {
+        if (!cassandra_future->yielded &&
+            cass_future_error_code(cassandra_future->future) == CASS_OK) {
+            cassandra_future->yielded = true;
             future_result_success_yield(cassandra_future);
         }
         return future;
@@ -263,11 +281,13 @@ static VALUE future_on_failure_synchronize(VALUE future)
         wakeup_thread = true;
     }
 
-    cassandra_future->on_failure_block = rb_block_proc();
+    RB_OBJ_WRITE(future, &cassandra_future->on_failure_block, rb_block_proc());
 
     if (cass_future_ready(cassandra_future->future)) {
         uv_sem_post(&cassandra_future->sem);
-        if (cass_future_error_code(cassandra_future->future) != CASS_OK) {
+        if (!cassandra_future->yielded &&
+            cass_future_error_code(cassandra_future->future) != CASS_OK) {
+            cassandra_future->yielded = true;
             future_result_failure_yield(cassandra_future);
         }
         return future;

data/ext/ilios/ilios.c

@@ -33,6 +33,8 @@ static ssize_t ilios_malloc_size(void *ptr)
     return malloc_usable_size(ptr);
 #elif defined(HAVE_MALLOC_SIZE)
     return malloc_size(ptr);
+#else
+    return 0;
 #endif
 }
 

data/ext/ilios/ilios.h

@@ -65,6 +65,7 @@ typedef struct
 
     uv_sem_t sem;
     bool already_waited;
+    bool yielded;
 } CassandraFuture;
 
 extern const rb_data_type_t cassandra_cluster_data_type;
@@ -100,7 +101,7 @@ extern void Init_statement(void);
 extern void Init_result(void);
 extern void Init_future(void);
 
-extern VALUE future_create(CassFuture *future, VALUE session, future_kind kind);
+extern VALUE future_create(CassFuture *future, VALUE session, VALUE statement, future_kind kind);
 extern void nogvl_future_wait(CassFuture *future);
 extern CassFuture *nogvl_session_prepare(CassSession* session, VALUE query);
 extern CassFuture *nogvl_session_execute(CassSession* session, CassStatement* statement);

data/ext/ilios/nogvl.c

@@ -59,8 +59,17 @@ static void *nogvl_sem_wait_cb(void *ptr)
     return NULL;
 }
 
+static void nogvl_sem_wait_ubf(void *ptr)
+{
+    uv_sem_t *sem = (uv_sem_t *)ptr;
+    // Wake the blocked uv_sem_wait so the call can be interrupted
+    // (e.g. Thread#kill) instead of relying on signal delivery, which
+    // uv_sem_wait restarts on EINTR.
+    uv_sem_post(sem);
+}
+
 void nogvl_sem_wait(uv_sem_t *sem)
 {
     // Releases GVL to run another thread while waiting
-    rb_thread_call_without_gvl(nogvl_sem_wait_cb, sem, RUBY_UBF_PROCESS, 0);
+    rb_thread_call_without_gvl(nogvl_sem_wait_cb, sem, nogvl_sem_wait_ubf, sem);
 }

data/ext/ilios/session.c

@@ -32,7 +32,7 @@ static VALUE session_prepare_async(VALUE self, VALUE query)
     GET_SESSION(self, cassandra_session);
 
     prepare_future = nogvl_session_prepare(cassandra_session->session, query);
-    return future_create(prepare_future, self, prepare_async);
+    return future_create(prepare_future, self, Qnil, prepare_async);
 }
 
 /**
@@ -91,7 +91,7 @@ static VALUE session_execute_async(VALUE self, VALUE statement)
     GET_STATEMENT(statement, cassandra_statement);
 
     result_future = nogvl_session_execute(cassandra_session->session, cassandra_statement->statement);
-    return future_create(result_future, self, execute_async);
+    return future_create(result_future, self, statement, execute_async);
 }
 
 /**

data/lib/ilios/version.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
 module Ilios
-  VERSION = '1.0.2'
+  VERSION = '1.0.3'
   public_constant :VERSION
 
   CASSANDRA_CPP_DRIVER_VERSION = '2.17.1'
   public_constant :CASSANDRA_CPP_DRIVER_VERSION
 
-  LIBUV_VERSION = '1.50.0'
+  LIBUV_VERSION = '1.52.1'
   public_constant :LIBUV_VERSION
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ilios
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Watson
@@ -58,7 +58,7 @@ metadata:
   homepage_uri: https://github.com/Watson1978/ilios
   source_code_uri: https://github.com/Watson1978/ilios
   bug_tracker_uri: https://github.com/Watson1978/ilios/issues
-  documentation_uri: https://www.rubydoc.info/gems/ilios/1.0.2
+  documentation_uri: https://www.rubydoc.info/gems/ilios/1.0.3
   rubygems_mfa_required: 'true'
 rdoc_options: []
 require_paths:
@@ -75,7 +75,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements:
 - cmake
-rubygems_version: 3.6.7
+rubygems_version: 4.0.10
 specification_version: 4
 summary: Cassandra driver written by C language
 test_files: []