ffi 1.1.2 → 1.17.0

data/ext/ffi_c/Function.c

@@ -1,44 +1,49 @@
 /*
  * Copyright (c) 2009-2011 Wayne Meissner
  *
+ * Copyright (c) 2008-2013, Ruby FFI project contributors
  * All rights reserved.
  *
- * This file is part of ruby-ffi.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of the Ruby FFI project nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
  *
- * This code is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License version 3 only, as
- * published by the Free Software Foundation.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
- * version 3 for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with this work.  If not, see <http://www.gnu.org/licenses/>.
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "MethodHandle.h"
-
 #ifndef _MSC_VER
 #include <sys/param.h>
 #endif
 #include <sys/types.h>
 #ifndef _WIN32
 # include <sys/mman.h>
+# include <unistd.h>
 #endif
+
 #include <stdio.h>
-#ifndef _MSC_VER
 #include <stdint.h>
 #include <stdbool.h>
-#else
-typedef int bool;
-#define true 1
-#define false 0
-#endif
 #include <ruby.h>
-#if defined(_MSC_VER) && !defined(INT8_MIN)
-#  include "win32/stdint.h"
+#include <ruby/thread.h>
+
+#if HAVE_RB_EXT_RACTOR_SAFE
+#include <ruby/ractor.h>
 #endif
 
 #include <ffi.h>
@@ -58,11 +63,15 @@ typedef int bool;
 #include "LastError.h"
 #include "Call.h"
 #include "ClosurePool.h"
-#include "Function.h"
 #include "MappedType.h"
 #include "Thread.h"
 #include "LongDouble.h"
+#include "MethodHandle.h"
+#include "Function.h"
+
+#define DEFER_ASYNC_CALLBACK 1
 
+struct async_cb_dispatcher;
 typedef struct Function_ {
     Pointer base;
     FunctionType* info;
@@ -71,33 +80,46 @@ typedef struct Function_ {
     Closure* closure;
     VALUE rbProc;
     VALUE rbFunctionInfo;
+#if defined(DEFER_ASYNC_CALLBACK)
+    struct async_cb_dispatcher *dispatcher;
+#endif
 } Function;
 
-static void function_mark(Function *);
-static void function_free(Function *);
+static void function_mark(void *data);
+static void function_compact(void *data);
+static void function_free(void *data);
+static size_t function_memsize(const void *data);
 static VALUE function_init(VALUE self, VALUE rbFunctionInfo, VALUE rbProc);
 static void callback_invoke(ffi_cif* cif, void* retval, void** parameters, void* user_data);
 static bool callback_prep(void* ctx, void* code, Closure* closure, char* errmsg, size_t errmsgsize);
 static void* callback_with_gvl(void* data);
-
-#define DEFER_ASYNC_CALLBACK 1
-
+static VALUE invoke_callback(VALUE data);
+static VALUE save_callback_exception(VALUE data, VALUE exc);
 
 #if defined(DEFER_ASYNC_CALLBACK)
 static VALUE async_cb_event(void *);
 static VALUE async_cb_call(void *);
 #endif
 
-#ifdef HAVE_RB_THREAD_CALL_WITH_GVL
-extern void *rb_thread_call_with_gvl(void *(*func)(void *), void *data1);
-#endif
+extern int ruby_thread_has_gvl_p(void);
+extern int ruby_native_thread_p(void);
+
+static const rb_data_type_t function_data_type = {
+    .wrap_struct_name = "FFI::Function",
+    .function = {
+        .dmark = function_mark,
+        .dfree = function_free,
+        .dsize = function_memsize,
+        ffi_compact_callback( function_compact )
+    },
+    .parent = &rbffi_pointer_data_type,
+    // IMPORTANT: WB_PROTECTED objects must only use the RB_OBJ_WRITE()
+    // macro to update VALUE references, as to trigger write barriers.
+    .flags = RUBY_TYPED_FREE_IMMEDIATELY | RUBY_TYPED_WB_PROTECTED | FFI_RUBY_TYPED_FROZEN_SHAREABLE
+};
 
 VALUE rbffi_FunctionClass = Qnil;
 
-#if defined(DEFER_ASYNC_CALLBACK)
-static VALUE async_cb_thread = Qnil;
-#endif
-
 static ID id_call = 0, id_to_native = 0, id_from_native = 0, id_cbtable = 0, id_cb_ref = 0;
 
 struct gvl_callback {
@@ -105,8 +127,12 @@ struct gvl_callback {
     void*    retval;
     void**   parameters;
     bool done;
+    rbffi_frame_t *frame;
 #if defined(DEFER_ASYNC_CALLBACK)
+    struct async_cb_dispatcher *dispatcher;
     struct gvl_callback* next;
+
+    /* Signal when the callback has finished and retval is set */
 # ifndef _WIN32
     pthread_cond_t async_cond;
     pthread_mutex_t async_mutex;
@@ -118,22 +144,78 @@ struct gvl_callback {
 
 
 #if defined(DEFER_ASYNC_CALLBACK)
-static struct gvl_callback* async_cb_list = NULL;
+struct async_cb_dispatcher {
+    /* the Ractor-local dispatcher thread */
+    VALUE thread;
+
+    /* single linked list of pending callbacks */
+    struct gvl_callback* async_cb_list;
+
+    /* Signal new entries in async_cb_list */
 # ifndef _WIN32
-    static pthread_mutex_t async_cb_mutex = PTHREAD_MUTEX_INITIALIZER;
-    static pthread_cond_t async_cb_cond = PTHREAD_COND_INITIALIZER;
-#  if !defined(HAVE_RB_THREAD_BLOCKING_REGION)
-    static int async_cb_pipe[2];
-#  endif
+    pthread_mutex_t async_cb_mutex;
+    pthread_cond_t async_cb_cond;
 # else
-    static HANDLE async_cb_cond;
-    static CRITICAL_SECTION async_cb_lock;
-#  if !defined(HAVE_RB_THREAD_BLOCKING_REGION)
-    static int async_cb_pipe[2];
-#  endif
+    HANDLE async_cb_cond;
+    CRITICAL_SECTION async_cb_lock;
 # endif
-#endif
+};
+
+#if HAVE_RB_EXT_RACTOR_SAFE
+static void
+async_cb_dispatcher_mark(void *ptr)
+{
+    struct async_cb_dispatcher *ctx = (struct async_cb_dispatcher *)ptr;
+    if (ctx) {
+        rb_gc_mark(ctx->thread);
+    }
+}
+
+static void
+async_cb_dispatcher_free(void *ptr)
+{
+    struct async_cb_dispatcher *ctx = (struct async_cb_dispatcher *)ptr;
+    if (ctx) {
+        xfree(ctx);
+    }
+}
+
+struct rb_ractor_local_storage_type async_cb_dispatcher_key_type = {
+    async_cb_dispatcher_mark,
+    async_cb_dispatcher_free,
+};
+
+static rb_ractor_local_key_t async_cb_dispatcher_key;
 
+static struct async_cb_dispatcher *
+async_cb_dispatcher_get(void)
+{
+    struct async_cb_dispatcher *ctx = (struct async_cb_dispatcher *)rb_ractor_local_storage_ptr(async_cb_dispatcher_key);
+    return ctx;
+}
+
+static void
+async_cb_dispatcher_set(struct async_cb_dispatcher *ctx)
+{
+    rb_ractor_local_storage_ptr_set(async_cb_dispatcher_key, ctx);
+}
+#else
+// for ruby 2.x
+static struct async_cb_dispatcher *async_cb_dispatcher = NULL;
+
+static struct async_cb_dispatcher *
+async_cb_dispatcher_get(void)
+{
+    return async_cb_dispatcher;
+}
+
+static void
+async_cb_dispatcher_set(struct async_cb_dispatcher *ctx)
+{
+    async_cb_dispatcher = ctx;
+}
+#endif
+#endif
 
 static VALUE
 function_allocate(VALUE klass)
@@ -141,28 +223,39 @@ function_allocate(VALUE klass)
     Function *fn;
     VALUE obj;
 
-    obj = Data_Make_Struct(klass, Function, function_mark, function_free, fn);
+    obj = TypedData_Make_Struct(klass, Function, &function_data_type, fn);
 
     fn->base.memory.flags = MEM_RD;
-    fn->base.rbParent = Qnil;
-    fn->rbProc = Qnil;
-    fn->rbFunctionInfo = Qnil;
+    RB_OBJ_WRITE(obj, &fn->base.rbParent, Qnil);
+    RB_OBJ_WRITE(obj, &fn->rbProc, Qnil);
+    RB_OBJ_WRITE(obj, &fn->rbFunctionInfo, Qnil);
     fn->autorelease = true;
 
     return obj;
 }
 
 static void
-function_mark(Function *fn)
+function_mark(void *data)
 {
-    rb_gc_mark(fn->base.rbParent);
-    rb_gc_mark(fn->rbProc);
-    rb_gc_mark(fn->rbFunctionInfo);
+    Function *fn = (Function *)data;
+    rb_gc_mark_movable(fn->base.rbParent);
+    rb_gc_mark_movable(fn->rbProc);
+    rb_gc_mark_movable(fn->rbFunctionInfo);
 }
 
 static void
-function_free(Function *fn)
+function_compact(void *data)
 {
+    Function *fn = (Function *)data;
+    ffi_gc_location(fn->base.rbParent);
+    ffi_gc_location(fn->rbProc);
+    ffi_gc_location(fn->rbFunctionInfo);
+}
+
+static void
+function_free(void *data)
+{
+    Function *fn = (Function *)data;
     if (fn->methodHandle != NULL) {
         rbffi_MethodHandle_Free(fn->methodHandle);
     }
@@ -174,6 +267,20 @@ function_free(Function *fn)
     xfree(fn);
 }
 
+static size_t
+function_memsize(const void *data)
+{
+    const Function *fn = (const Function *)data;
+    size_t memsize = sizeof(Function);
+
+    // Would be nice to better account for MethodHandle and Closure too.
+    if (fn->closure) {
+        memsize += sizeof(Closure);
+    }
+
+    return memsize;
+}
+
 /*
  * @param [Type, Symbol] return_type return type for the function
  * @param [Array<Type, Symbol>] param_types array of parameters types
@@ -191,7 +298,7 @@ function_free(Function *fn)
 static VALUE
 function_initialize(int argc, VALUE* argv, VALUE self)
 {
-    
+
     VALUE rbReturnType = Qnil, rbParamTypes = Qnil, rbProc = Qnil, rbOptions = Qnil;
     VALUE rbFunctionInfo = Qnil;
     VALUE infoArgv[3];
@@ -199,11 +306,11 @@ function_initialize(int argc, VALUE* argv, VALUE self)
 
     nargs = rb_scan_args(argc, argv, "22", &rbReturnType, &rbParamTypes, &rbProc, &rbOptions);
 
-    //
-    // Callback with block,
-    // e.g. Function.new(:int, [ :int ]) { |i| blah }
-    // or   Function.new(:int, [ :int ], { :convention => :stdcall }) { |i| blah }
-    //
+    /*
+     * Callback with block,
+     * e.g. Function.new(:int, [ :int ]) { |i| blah }
+     * or   Function.new(:int, [ :int ], { :convention => :stdcall }) { |i| blah }
+     */
     if (rb_block_given_p()) {
         if (nargs > 3) {
             rb_raise(rb_eArgError, "cannot create function with both proc/address and block");
@@ -211,20 +318,21 @@ function_initialize(int argc, VALUE* argv, VALUE self)
         rbOptions = rbProc;
         rbProc = rb_block_proc();
     } else {
-        // Callback with proc, or Function with address
-        // e.g. Function.new(:int, [ :int ], Proc.new { |i| })
-        //      Function.new(:int, [ :int ], Proc.new { |i| }, { :convention => :stdcall })
-        //      Function.new(:int, [ :int ], addr)
-        //      Function.new(:int, [ :int ], addr, { :convention => :stdcall })
+        /* Callback with proc, or Function with address
+         * e.g. Function.new(:int, [ :int ], Proc.new { |i| })
+         *      Function.new(:int, [ :int ], Proc.new { |i| }, { :convention => :stdcall })
+         *      Function.new(:int, [ :int ], addr)
+         *      Function.new(:int, [ :int ], addr, { :convention => :stdcall })
+         */
     }
-    
+
     infoArgv[0] = rbReturnType;
     infoArgv[1] = rbParamTypes;
     infoArgv[2] = rbOptions;
     rbFunctionInfo = rb_class_new_instance(rbOptions != Qnil ? 3 : 2, infoArgv, rbffi_FunctionTypeClass);
 
     function_init(self, rbFunctionInfo, rbProc);
-    
+
     return self;
 }
 
@@ -250,22 +358,22 @@ VALUE
 rbffi_Function_ForProc(VALUE rbFunctionInfo, VALUE proc)
 {
     VALUE callback, cbref, cbTable;
-    Function* fp;
 
     cbref = RTEST(rb_ivar_defined(proc, id_cb_ref)) ? rb_ivar_get(proc, id_cb_ref) : Qnil;
     /* If the first callback reference has the same function function signature, use it */
     if (cbref != Qnil && CLASS_OF(cbref) == rbffi_FunctionClass) {
-        Data_Get_Struct(cbref, Function, fp);
+        Function* fp;
+        TypedData_Get_Struct(cbref, Function, &function_data_type, fp);
         if (fp->rbFunctionInfo == rbFunctionInfo) {
             return cbref;
         }
     }
-    
+
     cbTable = RTEST(rb_ivar_defined(proc, id_cbtable)) ? rb_ivar_get(proc, id_cbtable) : Qnil;
     if (cbTable != Qnil && (callback = rb_hash_aref(cbTable, rbFunctionInfo)) != Qnil) {
         return callback;
     }
-    
+
     /* No existing function for the proc with that signature, create a new one and cache it */
     callback = rbffi_Function_NewInstance(rbFunctionInfo, proc);
     if (cbref == Qnil) {
@@ -273,30 +381,41 @@ rbffi_Function_ForProc(VALUE rbFunctionInfo, VALUE proc)
         rb_ivar_set(proc, id_cb_ref, callback);
     } else {
         /* The proc instance has been used as more than one type of callback, store extras in a hash */
-        cbTable = rb_hash_new();
-        rb_ivar_set(proc, id_cbtable, cbTable);
+        if(cbTable == Qnil) {
+          cbTable = rb_hash_new();
+          rb_ivar_set(proc, id_cbtable, cbTable);
+        }
         rb_hash_aset(cbTable, rbFunctionInfo, callback);
     }
 
     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)
 {
     Function* fn = NULL;
-    
-    Data_Get_Struct(self, Function, fn);
 
-    fn->rbFunctionInfo = rbFunctionInfo;
+    TypedData_Get_Struct(self, Function, &function_data_type, fn);
+
+    RB_OBJ_WRITE(self, &fn->rbFunctionInfo, rbFunctionInfo);
 
-    Data_Get_Struct(fn->rbFunctionInfo, FunctionType, fn->info);
+    TypedData_Get_Struct(fn->rbFunctionInfo, FunctionType, &rbffi_fntype_data_type, fn->info);
 
     if (rb_obj_is_kind_of(rbProc, rbffi_PointerClass)) {
         Pointer* orig;
-        Data_Get_Struct(rbProc, Pointer, orig);
+        TypedData_Get_Struct(rbProc, Pointer, &rbffi_pointer_data_type, orig);
         fn->base.memory = orig->memory;
-        fn->base.rbParent = rbProc;
+        RB_OBJ_WRITE(self, &fn->base.rbParent, rbProc);
 
     } else if (rb_obj_is_kind_of(rbProc, rb_cProc) || rb_respond_to(rbProc, id_call)) {
         if (fn->info->closurePool == NULL) {
@@ -307,17 +426,31 @@ function_init(VALUE self, VALUE rbFunctionInfo, VALUE rbProc)
         }
 
 #if defined(DEFER_ASYNC_CALLBACK)
-        if (async_cb_thread == Qnil) {
-#if !defined(HAVE_RB_THREAD_BLOCKING_REGION) && defined(_WIN32)
-            _pipe(async_cb_pipe, 1024, O_BINARY);
-#elif !defined(HAVE_RB_THREAD_BLOCKING_REGION)
-            pipe(async_cb_pipe);
-            fcntl(async_cb_pipe[0], F_SETFL, fcntl(async_cb_pipe[0], F_GETFL) | O_NONBLOCK);
-            fcntl(async_cb_pipe[1], F_SETFL, fcntl(async_cb_pipe[1], F_GETFL) | O_NONBLOCK);
+        {
+            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
-            async_cb_thread = rb_thread_create(async_cb_event, NULL);
-        }
+                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;
+        }
 #endif
 
         fn->closure = rbffi_Closure_Alloc(fn->info->closurePool);
@@ -330,8 +463,8 @@ function_init(VALUE self, VALUE rbFunctionInfo, VALUE rbProc)
         rb_raise(rb_eTypeError, "wrong argument type %s, expected pointer or proc",
                 rb_obj_classname(rbProc));
     }
-    
-    fn->rbProc = rbProc;
+
+    RB_OBJ_WRITE(self, &fn->rbProc, rbProc);
 
     return self;
 }
@@ -347,7 +480,7 @@ function_call(int argc, VALUE* argv, VALUE self)
 {
     Function* fn;
 
-    Data_Get_Struct(self, Function, fn);
+    TypedData_Get_Struct(self, Function, &function_data_type, fn);
 
     return (*fn->info->invoke)(argc, argv, fn->base.memory.address, fn->info);
 }
@@ -363,9 +496,9 @@ static VALUE
 function_attach(VALUE self, VALUE module, VALUE name)
 {
     Function* fn;
-    char var[1024];
 
-    Data_Get_Struct(self, Function, fn);
+    StringValue(name);
+    TypedData_Get_Struct(self, Function, &function_data_type, fn);
 
     if (fn->info->parameterCount == -1) {
         rb_raise(rb_eRuntimeError, "cannot attach variadic functions");
@@ -381,16 +514,10 @@ function_attach(VALUE self, VALUE module, VALUE name)
         fn->methodHandle = rbffi_MethodHandle_Alloc(fn->info, fn->base.memory.address);
     }
 
-    //
-    // Stash the Function in a module variable so it does not get garbage collected
-    //
-    snprintf(var, sizeof(var), "@@%s", StringValueCStr(name));
-    rb_cv_set(module, var, self);
-
     rb_define_singleton_method(module, StringValueCStr(name),
             rbffi_MethodHandle_CodeAddress(fn->methodHandle), -1);
 
-    
+
     rb_define_method(module, StringValueCStr(name),
             rbffi_MethodHandle_CodeAddress(fn->methodHandle), -1);
 
@@ -408,7 +535,8 @@ function_set_autorelease(VALUE self, VALUE autorelease)
 {
     Function* fn;
 
-    Data_Get_Struct(self, Function, fn);
+    rb_check_frozen(self);
+    TypedData_Get_Struct(self, Function, &function_data_type, fn);
 
     fn->autorelease = RTEST(autorelease);
 
@@ -420,11 +548,21 @@ function_autorelease_p(VALUE self)
 {
     Function* fn;
 
-    Data_Get_Struct(self, Function, fn);
+    TypedData_Get_Struct(self, Function, &function_data_type, fn);
 
     return fn->autorelease ? Qtrue : Qfalse;
 }
 
+static VALUE
+function_type(VALUE self)
+{
+    Function* fn;
+
+    TypedData_Get_Struct(self, Function, &function_data_type, fn);
+
+    return fn->rbFunctionInfo;
+}
+
 /*
  * call-seq: free
  * @return [self]
@@ -435,59 +573,57 @@ function_release(VALUE self)
 {
     Function* fn;
 
-    Data_Get_Struct(self, Function, fn);
+    TypedData_Get_Struct(self, Function, &function_data_type, fn);
 
     if (fn->closure == NULL) {
         rb_raise(rb_eRuntimeError, "cannot free function which was not allocated");
     }
-    
+
     rbffi_Closure_Free(fn->closure);
     fn->closure = NULL;
-    
+
     return self;
 }
 
 static void
 callback_invoke(ffi_cif* cif, void* retval, void** parameters, void* user_data)
 {
-    struct gvl_callback cb;
+    Function* fn;
+    struct gvl_callback cb = { 0 };
+
     cb.closure = (Closure *) user_data;
     cb.retval = retval;
     cb.parameters = parameters;
     cb.done = false;
+    cb.frame = rbffi_frame_current();
+    fn = (Function *) cb.closure->info;
+
+    if (cb.frame != NULL) cb.frame->exc = Qnil;
 
-    if (rbffi_thread_has_gvl_p()) {
+    if (ruby_native_thread_p()) {
+      if(ruby_thread_has_gvl_p()) {
         callback_with_gvl(&cb);
-    
-#if defined(HAVE_RUBY_NATIVE_THREAD_P) && defined (HAVE_RB_THREAD_CALL_WITH_GVL)
-    } else if (ruby_native_thread_p()) {
+      } else {
         rb_thread_call_with_gvl(callback_with_gvl, &cb);
-#endif
+      }
 #if defined(DEFER_ASYNC_CALLBACK) && !defined(_WIN32)
     } else {
         bool empty = false;
+        struct async_cb_dispatcher *ctx = fn->dispatcher;
 
         pthread_mutex_init(&cb.async_mutex, NULL);
         pthread_cond_init(&cb.async_cond, NULL);
 
-        // Now signal the async callback thread
-        pthread_mutex_lock(&async_cb_mutex);
-        empty = async_cb_list == NULL;
-        cb.next = async_cb_list;
-        async_cb_list = &cb;
-        pthread_mutex_unlock(&async_cb_mutex);
-
-#if !defined(HAVE_RB_THREAD_BLOCKING_REGION)
-        // Only signal if the list was empty
-        if (empty) {
-            char c;
-            write(async_cb_pipe[1], &c, 1);
-        }
-#else
-        pthread_cond_signal(&async_cb_cond);
-#endif
+        /* Now signal the async callback dispatcher thread */
+        pthread_mutex_lock(&ctx->async_cb_mutex);
+        empty = ctx->async_cb_list == NULL;
+        cb.next = ctx->async_cb_list;
+        ctx->async_cb_list = &cb;
+
+        pthread_cond_signal(&ctx->async_cb_cond);
+        pthread_mutex_unlock(&ctx->async_cb_mutex);
 
-        // Wait for the thread executing the ruby callback to signal it is done
+        /* Wait for the thread executing the ruby callback to signal it is done */
         pthread_mutex_lock(&cb.async_mutex);
         while (!cb.done) {
             pthread_cond_wait(&cb.async_cond, &cb.async_mutex);
@@ -499,27 +635,20 @@ callback_invoke(ffi_cif* cif, void* retval, void** parameters, void* user_data)
 #elif defined(DEFER_ASYNC_CALLBACK) && defined(_WIN32)
     } else {
         bool empty = false;
+        struct async_cb_dispatcher *ctx = fn->dispatcher;
 
         cb.async_event = CreateEvent(NULL, FALSE, FALSE, NULL);
 
-        // Now signal the async callback thread
-        EnterCriticalSection(&async_cb_lock);
-        empty = async_cb_list == NULL;
-        cb.next = async_cb_list;
-        async_cb_list = &cb;
-        LeaveCriticalSection(&async_cb_lock);
-
-#if !defined(HAVE_RB_THREAD_BLOCKING_REGION)
-        // Only signal if the list was empty
-        if (empty) {
-            char c;
-            write(async_cb_pipe[1], &c, 1);
-        }
-#else
-        SetEvent(async_cb_cond);
-#endif
+        /* Now signal the async callback dispatcher thread */
+        EnterCriticalSection(&ctx->async_cb_lock);
+        empty = ctx->async_cb_list == NULL;
+        cb.next = ctx->async_cb_list;
+        ctx->async_cb_list = &cb;
+        LeaveCriticalSection(&ctx->async_cb_lock);
 
-        // Wait for the thread executing the ruby callback to signal it is done
+        SetEvent(ctx->async_cb_cond);
+
+        /* Wait for the thread executing the ruby callback to signal it is done */
         WaitForSingleObject(cb.async_event, INFINITE);
         CloseHandle(cb.async_event);
 #endif
@@ -528,164 +657,108 @@ callback_invoke(ffi_cif* cif, void* retval, void** parameters, void* user_data)
 
 #if defined(DEFER_ASYNC_CALLBACK)
 struct async_wait {
+    struct async_cb_dispatcher *dispatcher;
     void* cb;
     bool stop;
 };
 
-static VALUE async_cb_wait(void *);
+static void * async_cb_wait(void *);
 static void async_cb_stop(void *);
 
-#if defined(HAVE_RB_THREAD_BLOCKING_REGION)
 static VALUE
-async_cb_event(void* unused)
+async_cb_event(void* ptr)
 {
-    struct async_wait w = { 0 };
+    struct async_cb_dispatcher *ctx = (struct async_cb_dispatcher *)ptr;
+    struct async_wait w = { ctx };
 
     w.stop = false;
     while (!w.stop) {
-        rb_thread_blocking_region(async_cb_wait, &w, async_cb_stop, &w);
+        rb_thread_call_without_gvl(async_cb_wait, &w, async_cb_stop, &w);
         if (w.cb != NULL) {
-            // Start up a new ruby thread to run the ruby callback
-            rb_thread_create(async_cb_call, w.cb);
-        }
-    }
-
-    return Qnil;
-}
-
-#elif defined(_WIN32)
-static VALUE
-async_cb_event(void* unused)
-{
-    while (true) {
-        struct gvl_callback* cb;
-        char buf[64];
-        fd_set rfds;
-
-        FD_ZERO(&rfds);
-        FD_SET(async_cb_pipe[0], &rfds);
-        rb_thread_select(async_cb_pipe[0] + 1, &rfds, NULL, NULL, NULL);
-        read(async_cb_pipe[0], buf, sizeof(buf));
-
-        EnterCriticalSection(&async_cb_lock);
-        cb = async_cb_list;
-        async_cb_list = NULL;
-        LeaveCriticalSection(&async_cb_lock);
-
-        while (cb != NULL) {
-            struct gvl_callback* next = cb->next;
-            // Start up a new ruby thread to run the ruby callback
-            rb_thread_create(async_cb_call, cb);
-            cb = next;
-        }
-    }
-
-    return Qnil;
-}
-#else
-static VALUE
-async_cb_event(void* unused)
-{
-    while (true) {
-        struct gvl_callback* cb;
-        char buf[64];
-
-        if (read(async_cb_pipe[0], buf, sizeof(buf)) < 0) {
-            rb_thread_wait_fd(async_cb_pipe[0]);
-            while (read(async_cb_pipe[0], buf, sizeof (buf)) < 0) {
-                if (rb_io_wait_readable(async_cb_pipe[0]) != Qtrue) {
-                    return Qfalse;
-                }
-            }
-        }
-
-        pthread_mutex_lock(&async_cb_mutex);
-        cb = async_cb_list;
-        async_cb_list = NULL;
-        pthread_mutex_unlock(&async_cb_mutex);
-
-        while (cb != NULL) {
-            struct gvl_callback* next = cb->next;
-            // Start up a new ruby thread to run the ruby callback
-            rb_thread_create(async_cb_call, cb);
-            cb = next;
+            /* Start up a new ruby thread to run the ruby callback */
+            VALUE new_thread = rb_thread_create(async_cb_call, w.cb);
+            /* Name thread, for better debugging */
+            rb_funcall(new_thread, rb_intern("name="), 1, rb_str_new2("FFI Callback Runner"));
         }
     }
 
     return Qnil;
 }
-#endif
 
 #ifdef _WIN32
-static VALUE
+static void *
 async_cb_wait(void *data)
 {
     struct async_wait* w = (struct async_wait *) data;
+    struct async_cb_dispatcher *ctx = w->dispatcher;
 
     w->cb = NULL;
 
-    EnterCriticalSection(&async_cb_lock);
+    EnterCriticalSection(&ctx->async_cb_lock);
 
-    while (!w->stop && async_cb_list == NULL) {
-        LeaveCriticalSection(&async_cb_lock);
-        WaitForSingleObject(async_cb_cond, INFINITE);
-        EnterCriticalSection(&async_cb_lock);
+    while (!w->stop && ctx->async_cb_list == NULL) {
+        LeaveCriticalSection(&ctx->async_cb_lock);
+        WaitForSingleObject(ctx->async_cb_cond, INFINITE);
+        EnterCriticalSection(&ctx->async_cb_lock);
     }
-    
-    if (async_cb_list != NULL) {
-        w->cb = async_cb_list;
-        async_cb_list = async_cb_list->next;
+
+    if (ctx->async_cb_list != NULL) {
+        w->cb = ctx->async_cb_list;
+        ctx->async_cb_list = ctx->async_cb_list->next;
     }
 
-    LeaveCriticalSection(&async_cb_lock);
-    
-    return Qnil;
+    LeaveCriticalSection(&ctx->async_cb_lock);
+
+    return NULL;
 }
 
 static void
 async_cb_stop(void *data)
 {
     struct async_wait* w = (struct async_wait *) data;
+    struct async_cb_dispatcher *ctx = w->dispatcher;
 
-    EnterCriticalSection(&async_cb_lock);
+    EnterCriticalSection(&ctx->async_cb_lock);
     w->stop = true;
-    LeaveCriticalSection(&async_cb_lock);
-    SetEvent(async_cb_cond);
+    LeaveCriticalSection(&ctx->async_cb_lock);
+    SetEvent(ctx->async_cb_cond);
 }
 
 #else
-static VALUE
+static void *
 async_cb_wait(void *data)
 {
     struct async_wait* w = (struct async_wait *) data;
+    struct async_cb_dispatcher *ctx = w->dispatcher;
 
     w->cb = NULL;
 
-    pthread_mutex_lock(&async_cb_mutex);
+    pthread_mutex_lock(&ctx->async_cb_mutex);
 
-    while (!w->stop && async_cb_list == NULL) {
-        pthread_cond_wait(&async_cb_cond, &async_cb_mutex);
+    while (!w->stop && ctx->async_cb_list == NULL) {
+        pthread_cond_wait(&ctx->async_cb_cond, &ctx->async_cb_mutex);
     }
-    
-    if (async_cb_list != NULL) {
-        w->cb = async_cb_list;
-        async_cb_list = async_cb_list->next;
+
+    if (ctx->async_cb_list != NULL) {
+        w->cb = ctx->async_cb_list;
+        ctx->async_cb_list = ctx->async_cb_list->next;
     }
 
-    pthread_mutex_unlock(&async_cb_mutex);
-    
-    return Qnil;
+    pthread_mutex_unlock(&ctx->async_cb_mutex);
+
+    return NULL;
 }
 
 static void
 async_cb_stop(void *data)
 {
     struct async_wait* w = (struct async_wait *) data;
+    struct async_cb_dispatcher *ctx = w->dispatcher;
 
-    pthread_mutex_lock(&async_cb_mutex);
+    pthread_mutex_lock(&ctx->async_cb_mutex);
     w->stop = true;
-    pthread_cond_signal(&async_cb_cond);
-    pthread_mutex_unlock(&async_cb_mutex);
+    pthread_cond_signal(&ctx->async_cb_cond);
+    pthread_mutex_unlock(&ctx->async_cb_mutex);
 }
 #endif
 
@@ -694,9 +767,9 @@ async_cb_call(void *data)
 {
     struct gvl_callback* cb = (struct gvl_callback *) data;
 
-    callback_with_gvl(cb);
+    callback_with_gvl(data);
 
-    // Signal the original native thread that the ruby code has completed
+    /* Signal the original native thread that the ruby code has completed */
 #ifdef _WIN32
     SetEvent(cb->async_event);
 #else
@@ -711,9 +784,15 @@ async_cb_call(void *data)
 
 #endif
 
-
-static void*
+static void *
 callback_with_gvl(void* data)
+{
+    rb_rescue2(invoke_callback, (VALUE) data, save_callback_exception, (VALUE) data, rb_eException, (VALUE) 0);
+    return NULL;
+}
+
+static VALUE
+invoke_callback(VALUE data)
 {
     struct gvl_callback* cb = (struct gvl_callback *) data;
 
@@ -734,8 +813,8 @@ callback_with_gvl(void* data)
         VALUE rbParamType = rb_ary_entry(cbInfo->rbParameterTypes, i);
 
         if (unlikely(paramType->nativeType == NATIVE_MAPPED)) {
-            paramType = ((MappedType *) paramType)->type;
             rbParamType = ((MappedType *) paramType)->rbType;
+            paramType = ((MappedType *) paramType)->type;
         }
 
         switch (paramType->nativeType) {
@@ -776,10 +855,10 @@ callback_with_gvl(void* data)
                 param = rb_float_new(*(double *) parameters[i]);
                 break;
             case NATIVE_LONGDOUBLE:
-	      param = rbffi_longdouble_new(*(long double *) parameters[i]);
+                param = rbffi_longdouble_new(*(long double *) parameters[i]);
                 break;
             case NATIVE_STRING:
-                param = (*(void **) parameters[i] != NULL) ? rb_tainted_str_new2(*(char **) parameters[i]) : Qnil;
+                param = (*(void **) parameters[i] != NULL) ? rb_str_new2(*(char **) parameters[i]) : Qnil;
                 break;
             case NATIVE_POINTER:
                 param = rbffi_Pointer_NewInstance(*(void **) parameters[i]);
@@ -789,7 +868,6 @@ callback_with_gvl(void* data)
                 break;
 
             case NATIVE_FUNCTION:
-            case NATIVE_CALLBACK:
             case NATIVE_STRUCT:
                 param = rbffi_NativeValue_ToRuby(paramType, rbParamType, parameters[i]);
                 break;
@@ -799,7 +877,7 @@ callback_with_gvl(void* data)
                 break;
         }
 
-        // Convert the native value into a custom ruby value
+        /* Convert the native value into a custom ruby value */
         if (unlikely(cbInfo->parameterTypes[i]->nativeType == NATIVE_MAPPED)) {
             VALUE values[] = { param, Qnil };
             param = rb_funcall2(((MappedType *) cbInfo->parameterTypes[i])->rbConverter, id_from_native, 2, values);
@@ -809,8 +887,7 @@ callback_with_gvl(void* data)
     }
 
     rbReturnValue = rb_funcall2(fn->rbProc, id_call, cbInfo->parameterCount, rbParams);
-    RB_GC_GUARD_PTR(rbParams);
-    
+
     if (unlikely(returnType->nativeType == NATIVE_MAPPED)) {
         VALUE values[] = { rbReturnValue, Qnil };
         rbReturnValue = rb_funcall2(((MappedType *) returnType)->rbConverter, id_to_native, 2, values);
@@ -849,11 +926,16 @@ callback_with_gvl(void* data)
         case NATIVE_FLOAT64:
             *((double *) retval) = NUM2DBL(rbReturnValue);
             break;
+        case NATIVE_LONGDOUBLE:
+            *((long double *) retval) = rbffi_num2longdouble(rbReturnValue);
+            break;
         case NATIVE_POINTER:
             if (TYPE(rbReturnValue) == T_DATA && rb_obj_is_kind_of(rbReturnValue, rbffi_PointerClass)) {
-                *((void **) retval) = ((AbstractMemory *) DATA_PTR(rbReturnValue))->address;
+                AbstractMemory* memory;
+                TypedData_Get_Struct(rbReturnValue, AbstractMemory, &rbffi_abstract_memory_data_type, memory);
+                *((void **) retval) = memory->address;
             } else {
-                // Default to returning NULL if not a value pointer object.  handles nil case as well
+                /* Default to returning NULL if not a value pointer object.  handles nil case as well */
                 *((void **) retval) = NULL;
             }
             break;
@@ -863,17 +945,21 @@ callback_with_gvl(void* data)
             break;
 
         case NATIVE_FUNCTION:
-        case NATIVE_CALLBACK:
             if (TYPE(rbReturnValue) == T_DATA && rb_obj_is_kind_of(rbReturnValue, rbffi_PointerClass)) {
+                AbstractMemory* memory;
+                TypedData_Get_Struct(rbReturnValue, AbstractMemory, &rbffi_abstract_memory_data_type, memory);
 
-                *((void **) retval) = ((AbstractMemory *) DATA_PTR(rbReturnValue))->address;
+                *((void **) retval) = memory->address;
 
             } else if (rb_obj_is_kind_of(rbReturnValue, rb_cProc) || rb_respond_to(rbReturnValue, id_call)) {
                 VALUE function;
+                AbstractMemory* memory;
 
                 function = rbffi_Function_ForProc(rbReturnType, rbReturnValue);
 
-                *((void **) retval) = ((AbstractMemory *) DATA_PTR(function))->address;
+                TypedData_Get_Struct(function, AbstractMemory, &rbffi_abstract_memory_data_type, memory);
+
+                *((void **) retval) = memory->address;
             } else {
                 *((void **) retval) = NULL;
             }
@@ -881,7 +967,11 @@ callback_with_gvl(void* data)
 
         case NATIVE_STRUCT:
             if (TYPE(rbReturnValue) == T_DATA && rb_obj_is_kind_of(rbReturnValue, rbffi_StructClass)) {
-                AbstractMemory* memory = ((Struct *) DATA_PTR(rbReturnValue))->pointer;
+                Struct* s;
+                AbstractMemory* memory;
+
+                TypedData_Get_Struct(rbReturnValue, Struct, &rbffi_struct_data_type, s);
+                memory = s->pointer;
 
                 if (memory->address != NULL) {
                     memcpy(retval, memory->address, returnType->ffiType->size);
@@ -889,7 +979,7 @@ callback_with_gvl(void* data)
                 } else {
                     memset(retval, 0, returnType->ffiType->size);
                 }
-                
+
             } else {
                 memset(retval, 0, returnType->ffiType->size);
             }
@@ -900,9 +990,19 @@ callback_with_gvl(void* data)
             break;
     }
 
-    return NULL;
+    return Qnil;
 }
 
+static VALUE
+save_callback_exception(VALUE data, VALUE exc)
+{
+    struct gvl_callback* cb = (struct gvl_callback *) data;
+
+    memset(cb->retval, 0, ((Function *) cb->closure->info)->info->returnType->ffiType->size);
+    if (cb->frame != NULL) cb->frame->exc = exc;
+
+    return Qnil;
+}
 
 static bool
 callback_prep(void* ctx, void* code, Closure* closure, char* errmsg, size_t errmsgsize)
@@ -910,9 +1010,9 @@ callback_prep(void* ctx, void* code, Closure* closure, char* errmsg, size_t errm
     FunctionType* fnInfo = (FunctionType *) ctx;
     ffi_status ffiStatus;
 
-    ffiStatus = ffi_prep_closure(code, &fnInfo->ffi_cif, callback_invoke, closure);
+    ffiStatus = ffi_prep_closure_loc(closure->pcl, &fnInfo->ffi_cif, callback_invoke, closure, code);
     if (ffiStatus != FFI_OK) {
-        snprintf(errmsg, errmsgsize, "ffi_prep_closure failed.  status=%#x", ffiStatus);
+        snprintf(errmsg, errmsgsize, "ffi_prep_closure_loc failed.  status=%#x", ffiStatus);
         return false;
     }
 
@@ -927,7 +1027,7 @@ rbffi_Function_Init(VALUE moduleFFI)
      * Document-class: FFI::Function < FFI::Pointer
      */
     rbffi_FunctionClass = rb_define_class_under(moduleFFI, "Function", rbffi_PointerClass);
-    
+
     rb_global_variable(&rbffi_FunctionClass);
     rb_define_alloc_func(rbffi_FunctionClass, function_allocate);
 
@@ -937,6 +1037,7 @@ rbffi_Function_Init(VALUE moduleFFI)
     rb_define_method(rbffi_FunctionClass, "attach", function_attach, 2);
     rb_define_method(rbffi_FunctionClass, "free", function_release, 0);
     rb_define_method(rbffi_FunctionClass, "autorelease=", function_set_autorelease, 1);
+    rb_define_private_method(rbffi_FunctionClass, "type", function_type, 0);
     /*
      * call-seq: autorelease
      * @return [Boolean]
@@ -956,9 +1057,7 @@ rbffi_Function_Init(VALUE moduleFFI)
     id_cb_ref = rb_intern("@__ffi_callback__");
     id_to_native = rb_intern("to_native");
     id_from_native = rb_intern("from_native");
-#if defined(_WIN32)
-    InitializeCriticalSection(&async_cb_lock);
-    async_cb_cond = CreateEvent(NULL, FALSE, FALSE, NULL);
+#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
 }
-