ffi 1.17.0 → 1.17.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 482fe808cf14286b91be92938712e98f6332021d2773268f96ac583b5c264fc9
-  data.tar.gz: f89f881dd5e337ec5ec815e9977158b54ead3a2480bc03fd2591477c7872d29e
+  metadata.gz: 3a6a87ee152caf4030d9a90bedcefece7f4717639dc96443727b1e1c492db617
+  data.tar.gz: 722b6e07fb23b25c2ad2c2e426040e2fb3f929e6dda3c00c26ac7fbc7c7820aa
 SHA512:
-  metadata.gz: 877625d5994e1b456e8cf12a68647ce4e9d64efac2239c7a4e1806406b803fad5c1138ba0ad7e8b34ac6b8ebfeaed9f469381291f394527c523c4db8f36bd976
-  data.tar.gz: 8d78610fc0c110ad7d6da40158dab176d815c8008a1276865b9112a44b46e1d43816db7430f9ab991671e4e8fad4dec0880fa259e2e2c83afaf916f59b7bb5c9
+  metadata.gz: a4b65f1f9f9852a7d74c0739eb940f487a85354466b998caf4e637b20046c91a4338c389992de8d42118536624db2bbab4b4de799477af3591701e823355a69c
+  data.tar.gz: 6877266da6f47d6d921b8535ee63737caefeb89a937489a1c4756273b87bdcfec93f13e5c9a4dd7c7c56a680d0b1822aecf0197b9b92f778778732cf9fa6556e

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+1.17.1 / 2024-12-30
+-------------------
+
+Fixed:
+* #1117 Restart async callback dispatcher thread after fork.
+* #1133 Add ruby-3.4 native gem.
+* #1134 Fix FFI::DataConverter non-generic usage in RBS files.
+
+
 1.17.0 / 2024-06-02
 -------------------
 

data/Gemfile

@@ -5,7 +5,7 @@ group :development do
   gem 'bundler', '>= 1.16', '< 3'
   gem 'rake', '~> 13.0'
   gem 'rake-compiler', '~> 1.1'
-  gem 'rake-compiler-dock', '~> 1.0.pre'
+  gem 'rake-compiler-dock', '~> 1.7.0'
   gem 'rspec', '~> 3.0'
 end
 

data/Rakefile

@@ -136,7 +136,7 @@ namespace "gem" do
     desc "Build the native gem for #{plat}"
     task plat => ['prepare', 'build'] do
       RakeCompilerDock.sh <<-EOT, platform: plat
-        #{ "sudo apt-get update && sudo apt-get install -y libltdl-dev &&" if plat !~ /linux/ }
+        sudo apt-get update && sudo apt-get install -y libltdl-dev &&
         bundle --local &&
         rake native:#{plat} pkg/#{gem_spec.full_name}-#{plat}.gem MAKE='nice make -j`nproc`' RUBY_CC_VERSION=${RUBY_CC_VERSION/:2.4.0/}
       EOT

data/ext/ffi_c/Function.c

@@ -215,6 +215,52 @@ async_cb_dispatcher_set(struct async_cb_dispatcher *ctx)
     async_cb_dispatcher = ctx;
 }
 #endif
+
+static void
+async_cb_dispatcher_initialize(struct async_cb_dispatcher *ctx)
+{
+        ctx->async_cb_list = NULL;
+
+#if !defined(_WIN32)
+        /* n.b. we _used_ to try and destroy the mutex/cond before initializing here,
+         * but it's undefined what happens if you try and destory an unitialized cond.
+         * glibc in particular seems to wait for any concurrent waiters to finish before
+         * destroying a condvar, trying to destroy a condvar after fork that someone was
+         * waiting on pre-fork won't work. Just re-init he memory directly. */
+        pthread_mutex_init(&ctx->async_cb_mutex, NULL);
+        pthread_cond_init(&ctx->async_cb_cond, NULL);
+#else
+        InitializeCriticalSection(&ctx->async_cb_lock);
+        ctx->async_cb_cond = CreateEvent(NULL, FALSE, FALSE, NULL);
+#endif
+    ctx->thread = rb_thread_create(async_cb_event, ctx);
+
+    /* Name thread, for better debugging */
+    rb_funcall(ctx->thread, rb_intern("name="), 1, rb_str_new2("FFI Callback Dispatcher"));
+}
+
+static struct async_cb_dispatcher *
+async_cb_dispatcher_ensure_created(void)
+{
+    struct async_cb_dispatcher *ctx = async_cb_dispatcher_get();
+    if (ctx == NULL) {
+        ctx = (struct async_cb_dispatcher*)ALLOC(struct async_cb_dispatcher);
+        async_cb_dispatcher_initialize(ctx);
+        async_cb_dispatcher_set(ctx);
+    }
+    return ctx;
+}
+
+
+static VALUE
+async_cb_dispatcher_atfork_child(VALUE self)
+{
+    struct async_cb_dispatcher *ctx = async_cb_dispatcher_get();
+    if (ctx) {
+        async_cb_dispatcher_initialize(ctx);
+    }
+    return Qnil;
+}
 #endif
 
 static VALUE
@@ -391,15 +437,6 @@ rbffi_Function_ForProc(VALUE rbFunctionInfo, VALUE proc)
     return callback;
 }
 
-#if !defined(_WIN32) && defined(DEFER_ASYNC_CALLBACK)
-static void
-after_fork_callback(void)
-{
-    /* Ensure that a new dispatcher thread is started in a forked process */
-    async_cb_dispatcher_set(NULL);
-}
-#endif
-
 static VALUE
 function_init(VALUE self, VALUE rbFunctionInfo, VALUE rbProc)
 {
@@ -426,31 +463,7 @@ function_init(VALUE self, VALUE rbFunctionInfo, VALUE rbProc)
         }
 
 #if defined(DEFER_ASYNC_CALLBACK)
-        {
-            struct async_cb_dispatcher *ctx = async_cb_dispatcher_get();
-            if (ctx == NULL) {
-                ctx = (struct async_cb_dispatcher*)ALLOC(struct async_cb_dispatcher);
-                ctx->async_cb_list = NULL;
-
-#if !defined(_WIN32)
-                pthread_mutex_init(&ctx->async_cb_mutex, NULL);
-                pthread_cond_init(&ctx->async_cb_cond, NULL);
-                if( pthread_atfork(NULL, NULL, after_fork_callback) ){
-                    rb_warn("FFI: unable to register fork callback");
-                }
-#else
-                InitializeCriticalSection(&ctx->async_cb_lock);
-                ctx->async_cb_cond = CreateEvent(NULL, FALSE, FALSE, NULL);
-#endif
-                ctx->thread = rb_thread_create(async_cb_event, ctx);
-
-                /* Name thread, for better debugging */
-                rb_funcall(ctx->thread, rb_intern("name="), 1, rb_str_new2("FFI Callback Dispatcher"));
-
-                async_cb_dispatcher_set(ctx);
-            }
-            fn->dispatcher = ctx;
-        }
+        fn->dispatcher = async_cb_dispatcher_ensure_created();
 #endif
 
         fn->closure = rbffi_Closure_Alloc(fn->info->closurePool);
@@ -1060,4 +1073,9 @@ rbffi_Function_Init(VALUE moduleFFI)
 #if defined(DEFER_ASYNC_CALLBACK) && defined(HAVE_RB_EXT_RACTOR_SAFE)
     async_cb_dispatcher_key = rb_ractor_local_storage_ptr_newkey(&async_cb_dispatcher_key_type);
 #endif
+#ifdef DEFER_ASYNC_CALLBACK
+  /* Ruby code will call this method in a Process._fork patch */
+  rb_define_singleton_method(moduleFFI, "_async_cb_dispatcher_atfork_child",
+                             async_cb_dispatcher_atfork_child, 0);
+#endif
 }