ffi 1.9.25 → 1.15.0

data/ext/ffi_c/Thread.c

@@ -28,12 +28,7 @@
  */
 
 #include <stddef.h>
-#ifndef _MSC_VER
 #include <stdbool.h>
-#else
-# include "win32/stdbool.h"
-# include "win32/stdint.h"
-#endif
 
 #if defined(__CYGWIN__) || !defined(_WIN32)
 # include <pthread.h>
@@ -70,13 +65,12 @@ rbffi_frame_current(void)
 #endif
 }
 
-void 
+void
 rbffi_frame_push(rbffi_frame_t* frame)
 {
     memset(frame, 0, sizeof(*frame));
-    frame->has_gvl = true;
     frame->exc = Qnil;
-    
+
 #ifdef _WIN32
     frame->prev = TlsGetValue(frame_thread_key);
     TlsSetValue(frame_thread_key, frame);
@@ -87,7 +81,7 @@ rbffi_frame_push(rbffi_frame_t* frame)
 #endif
 }
 
-void 
+void
 rbffi_frame_pop(rbffi_frame_t* frame)
 {
 #ifdef _WIN32
@@ -97,224 +91,6 @@ rbffi_frame_pop(rbffi_frame_t* frame)
 #endif
 }
 
-#if !(defined(HAVE_RB_THREAD_BLOCKING_REGION) || defined(HAVE_RB_THREAD_CALL_WITHOUT_GVL))
-
-#if !defined(_WIN32)
-
-struct BlockingThread {
-    pthread_t tid;
-    VALUE (*fn)(void *);
-    void *data;
-    void (*ubf)(void *);
-    void *data2;
-    VALUE retval;
-    int wrfd;
-    int rdfd;
-};
-
-static void*
-rbffi_blocking_thread(void* args)
-{
-    struct BlockingThread* thr = (struct BlockingThread *) args;
-    char c = 1;
-    VALUE retval;
-    
-    retval = (*thr->fn)(thr->data);
-    
-    pthread_testcancel();
-
-    thr->retval = retval;
-    
-    write(thr->wrfd, &c, sizeof(c));
-
-    return NULL;
-}
-
-static VALUE
-wait_for_thread(void *data)
-{
-    struct BlockingThread* thr = (struct BlockingThread *) data;
-    char c;
-    
-    if (read(thr->rdfd, &c, 1) < 1) {
-        rb_thread_wait_fd(thr->rdfd);
-        while (read(thr->rdfd, &c, 1) < 1 && rb_io_wait_readable(thr->rdfd) == Qtrue) {
-            ;
-        }
-    }
-
-    return Qnil;
-}
-
-static VALUE
-cleanup_blocking_thread(void *data, VALUE exc)
-{
-    struct BlockingThread* thr = (struct BlockingThread *) data;
-
-    if (thr->ubf != (void (*)(void *)) -1) {
-        (*thr->ubf)(thr->data2);
-    } else {
-        pthread_kill(thr->tid, SIGVTALRM);
-    }
-
-    return exc;
-}
-
-VALUE
-rbffi_thread_blocking_region(VALUE (*func)(void *), void *data1, void (*ubf)(void *), void *data2)
-{
-    struct BlockingThread* thr;
-    int fd[2];
-    VALUE exc;
-    
-    if (pipe(fd) < 0) {
-        rb_raise(rb_eSystemCallError, "pipe(2) failed");
-        return Qnil;
-    }
-    fcntl(fd[0], F_SETFL, fcntl(fd[0], F_GETFL) | O_NONBLOCK);
-
-    thr = ALLOC_N(struct BlockingThread, 1);
-    thr->rdfd = fd[0];
-    thr->wrfd = fd[1];
-    thr->fn = func;
-    thr->data = data1;
-    thr->ubf = ubf;
-    thr->data2 = data2;
-    thr->retval = Qnil;
-
-    if (pthread_create(&thr->tid, NULL, rbffi_blocking_thread, thr) != 0) {
-        close(fd[0]);
-        close(fd[1]);
-        xfree(thr);
-        rb_raise(rb_eSystemCallError, "pipe(2) failed");
-        return Qnil;
-    }
-
-    exc = rb_rescue2(wait_for_thread, (VALUE) thr, cleanup_blocking_thread, (VALUE) thr,
-        rb_eException);
-    
-    pthread_join(thr->tid, NULL);
-    close(fd[1]);
-    close(fd[0]);
-    xfree(thr);
-
-    if (exc != Qnil) {
-        rb_exc_raise(exc);
-    }
-
-    return thr->retval;
-}
-
-#else
-/* win32 implementation */
-
-struct BlockingThread {
-    HANDLE tid;
-    VALUE (*fn)(void *);
-    void *data;
-    void (*ubf)(void *);
-    void *data2;
-    VALUE retval;
-    int wrfd;
-    int rdfd;
-};
-
-static DWORD __stdcall
-rbffi_blocking_thread(LPVOID args)
-{
-    struct BlockingThread* thr = (struct BlockingThread *) args;
-    char c = 1;
-    VALUE retval;
-
-    retval = (*thr->fn)(thr->data);
-    thr->retval = retval;
-
-    write(thr->wrfd, &c, sizeof(c));
-
-    return 0;
-}
-
-static VALUE
-wait_for_thread(void *data)
-{
-    struct BlockingThread* thr = (struct BlockingThread *) data;
-    char c, res;
-    fd_set rfds;
-
-    FD_ZERO(&rfds);
-    FD_SET(thr->rdfd, &rfds);
-    rb_thread_select(thr->rdfd + 1, &rfds, NULL, NULL, NULL);
-    read(thr->rdfd, &c, 1);
-    return Qnil;
-}
-
-static VALUE
-cleanup_blocking_thread(void *data, VALUE exc)
-{
-    struct BlockingThread* thr = (struct BlockingThread *) data;
-
-    if (thr->ubf != (void (*)(void *)) -1) {
-        (*thr->ubf)(thr->data2);
-    } else {
-        TerminateThread(thr->tid, 0);
-    }
-
-    return exc;
-}
-
-VALUE
-rbffi_thread_blocking_region(VALUE (*func)(void *), void *data1, void (*ubf)(void *), void *data2)
-{
-    struct BlockingThread* thr;
-    int fd[2];
-    VALUE exc;
-    DWORD state;
-    DWORD res;
-
-    if (_pipe(fd, 1024, O_BINARY) == -1) {
-        rb_raise(rb_eSystemCallError, "_pipe() failed");
-        return Qnil;
-    }
-
-    thr = ALLOC_N(struct BlockingThread, 1);
-    thr->rdfd = fd[0];
-    thr->wrfd = fd[1];
-    thr->fn = func;
-    thr->data = data1;
-    thr->ubf = ubf;
-    thr->data2 = data2;
-    thr->retval = Qnil;
-
-    thr->tid = CreateThread(NULL, 0, rbffi_blocking_thread, thr, 0, NULL);
-    if (!thr->tid) {
-        close(fd[0]);
-        close(fd[1]);
-        xfree(thr);
-        rb_raise(rb_eSystemCallError, "CreateThread() failed");
-        return Qnil;
-    }
-
-    exc = rb_rescue2(wait_for_thread, (VALUE) thr, cleanup_blocking_thread, (VALUE) thr,
-        rb_eException);
-
-    /* The thread should be finished, already. */
-    WaitForSingleObject(thr->tid, INFINITE);
-    CloseHandle(thr->tid);
-    close(fd[1]);
-    close(fd[0]);
-    xfree(thr);
-
-    if (exc != Qnil) {
-        rb_exc_raise(exc);
-    }
-
-    return thr->retval;
-}
-
-#endif /* !_WIN32 */
-
-#endif /* HAVE_RB_THREAD_BLOCKING_REGION */
-
 #ifndef _WIN32
 static struct thread_data* thread_data_init(void);
 
@@ -348,6 +124,6 @@ rbffi_Thread_Init(VALUE moduleFFI)
 #ifdef _WIN32
     frame_thread_key = TlsAlloc();
 #else
-    pthread_key_create(&thread_data_key, thread_data_free);    
+    pthread_key_create(&thread_data_key, thread_data_free);
 #endif
 }

data/ext/ffi_c/Thread.h

@@ -30,12 +30,7 @@
 #ifndef RBFFI_THREAD_H
 #define	RBFFI_THREAD_H
 
-#ifndef _MSC_VER
-# include <stdbool.h>
-#else
-# include "win32/stdbool.h"
-# include "win32/stdint.h"
-#endif
+#include <stdbool.h>
 #include <ruby.h>
 #include "extconf.h"
 
@@ -66,7 +61,6 @@ typedef struct rbffi_frame {
     struct thread_data* td;
 #endif
     struct rbffi_frame* prev;
-    bool has_gvl;
     VALUE exc;
 } rbffi_frame_t;
 
@@ -74,19 +68,6 @@ rbffi_frame_t* rbffi_frame_current(void);
 void rbffi_frame_push(rbffi_frame_t* frame);
 void rbffi_frame_pop(rbffi_frame_t* frame);
 
-#ifdef HAVE_RB_THREAD_CALL_WITHOUT_GVL
-# define rbffi_thread_blocking_region rb_thread_call_without_gvl
-
-#elif defined(HAVE_RB_THREAD_BLOCKING_REGION)
-# define rbffi_thread_blocking_region rb_thread_blocking_region
-
-#else
-
-VALUE rbffi_thread_blocking_region(VALUE (*func)(void *), void *data1, void (*ubf)(void *), void *data2);
-
-#endif
-
-
 #ifdef	__cplusplus
 }
 #endif

data/ext/ffi_c/Type.c

@@ -28,7 +28,7 @@
  */
 
 #ifndef _MSC_VER
-#include <sys/param.h>
+# include <sys/param.h>
 #endif
 
 #include <sys/types.h>
@@ -235,24 +235,6 @@ rbffi_Type_Lookup(VALUE name)
     return Qnil;
 }
 
-/**
- * rbffi_Type_Find() is like rbffi_Type_Lookup, but an error is raised if the
- * type is not found.
- */
-VALUE
-rbffi_Type_Find(VALUE name)
-{
-    VALUE rbType = rbffi_Type_Lookup(name);
-
-    if (!RTEST(rbType)) {
-        VALUE s = rb_inspect(name);
-        rb_raise(rb_eTypeError, "invalid type, %s", RSTRING_PTR(s));
-        RB_GC_GUARD(s);
-    }
-
-    return rbType;
-}
-
 void
 rbffi_Type_Init(VALUE moduleFFI)
 {

data/ext/ffi_c/Type.h

@@ -52,7 +52,6 @@ struct Type_ {
 
 extern VALUE rbffi_TypeClass;
 extern VALUE rbffi_Type_Lookup(VALUE type);
-extern VALUE rbffi_Type_Find(VALUE type);
 
 #ifdef	__cplusplus
 }

data/ext/ffi_c/Types.c

@@ -80,15 +80,14 @@ rbffi_NativeValue_ToRuby(Type* type, VALUE rbType, const void* ptr)
 	  return rbffi_longdouble_new(*(long double *) ptr);
 
         case NATIVE_STRING:
-            return (*(void **) ptr != NULL) ? rb_tainted_str_new2(*(char **) ptr) : Qnil;
+            return (*(void **) ptr != NULL) ? rb_str_new2(*(char **) ptr) : Qnil;
         case NATIVE_POINTER:
             return rbffi_Pointer_NewInstance(*(void **) ptr);
         case NATIVE_BOOL:
             return ((unsigned char) *(ffi_arg *) ptr) ? Qtrue : Qfalse;
-        
-        case NATIVE_FUNCTION:
-        case NATIVE_CALLBACK: {
-            return *(void **) ptr != NULL 
+
+        case NATIVE_FUNCTION: {
+            return *(void **) ptr != NULL
                     ? rbffi_Function_NewInstance(rbType, rbffi_Pointer_NewInstance(*(void **) ptr))
                     : Qnil;
         }
@@ -116,15 +115,15 @@ rbffi_NativeValue_ToRuby(Type* type, VALUE rbType, const void* ptr)
 
             values[0] = rbffi_NativeValue_ToRuby(m->type, m->rbType, ptr);
             values[1] = Qnil;
-            
+
 
             rbReturnValue = rb_funcall2(m->rbConverter, id_from_native, 2, values);
             RB_GC_GUARD(values[0]);
             RB_GC_GUARD(rbType);
-            
+
             return rbReturnValue;
         }
-    
+
         default:
             rb_raise(rb_eRuntimeError, "Unknown type: %d", type->nativeType);
             return Qnil;

data/ext/ffi_c/Types.h

@@ -51,20 +51,19 @@ typedef enum {
     NATIVE_FLOAT64,
     NATIVE_LONGDOUBLE,
     NATIVE_POINTER,
-    NATIVE_CALLBACK,
     NATIVE_FUNCTION,
     NATIVE_BUFFER_IN,
     NATIVE_BUFFER_OUT,
     NATIVE_BUFFER_INOUT,
     NATIVE_CHAR_ARRAY,
     NATIVE_BOOL,
-    
+
     /** An immutable string.  Nul terminated, but only copies in to the native function */
     NATIVE_STRING,
-    
+
     /** The function takes a variable number of arguments */
     NATIVE_VARARGS,
-    
+
     /** Struct-by-value param or result */
     NATIVE_STRUCT,
 

data/ext/ffi_c/Variadic.c

@@ -33,13 +33,8 @@
 #include <sys/types.h>
 
 #include <stdio.h>
-#ifndef _MSC_VER
-# include <stdint.h>
-# include <stdbool.h>
-#else
-# include "win32/stdbool.h"
-# include "win32/stdint.h"
-#endif
+#include <stdint.h>
+#include <stdbool.h>
 #include <ruby.h>
 
 #include <ffi.h>
@@ -173,7 +168,8 @@ variadic_invoke(VALUE self, VALUE parameterTypes, VALUE parameterValues)
     ffi_type* ffiReturnType;
     Type** paramTypes;
     VALUE* argv;
-    int paramCount = 0, fixedCount = 0, i;
+    VALUE* callbackParameters;
+    int paramCount = 0, fixedCount = 0, callbackCount = 0, i;
     ffi_status ffiStatus;
     rbffi_frame_t frame = { 0 };
 
@@ -187,11 +183,12 @@ variadic_invoke(VALUE self, VALUE parameterTypes, VALUE parameterValues)
     params = ALLOCA_N(FFIStorage, paramCount);
     ffiValues = ALLOCA_N(void*, paramCount);
     argv = ALLOCA_N(VALUE, paramCount);
+    callbackParameters = ALLOCA_N(VALUE, paramCount);
     retval = alloca(MAX(invoker->returnType->ffiType->size, FFI_SIZEOF_ARG));
 
     for (i = 0; i < paramCount; ++i) {
         VALUE rbType = rb_ary_entry(parameterTypes, i);
-        
+
         if (!rb_obj_is_kind_of(rbType, rbffi_TypeClass)) {
             rb_raise(rb_eTypeError, "wrong type.  Expected (FFI::Type)");
         }
@@ -210,17 +207,25 @@ variadic_invoke(VALUE self, VALUE parameterTypes, VALUE parameterValues)
                 rbType = rb_const_get(rbffi_TypeClass, rb_intern("UINT32"));
                 Data_Get_Struct(rbType, Type, paramTypes[i]);
                 break;
-            
+
             case NATIVE_FLOAT32:
                 rbType = rb_const_get(rbffi_TypeClass, rb_intern("DOUBLE"));
                 Data_Get_Struct(rbType, Type, paramTypes[i]);
                 break;
 
+            case NATIVE_FUNCTION:
+                if (!rb_obj_is_kind_of(rbType, rbffi_FunctionTypeClass)) {
+                    VALUE typeName = rb_funcall2(rbType, rb_intern("inspect"), 0, NULL);
+                    rb_raise(rb_eTypeError, "Incorrect parameter type (%s)", RSTRING_PTR(typeName));
+                }
+                callbackParameters[callbackCount++] = rbType;
+                break;
+
             default:
                 break;
         }
-        
-        
+
+
         ffiParamTypes[i] = paramTypes[i]->ffiType;
         if (ffiParamTypes[i] == NULL) {
             rb_raise(rb_eArgError, "Invalid parameter type #%x", paramTypes[i]->nativeType);
@@ -253,14 +258,10 @@ variadic_invoke(VALUE self, VALUE parameterTypes, VALUE parameterValues)
     }
 
     rbffi_SetupCallParams(paramCount, argv, -1, paramTypes, params,
-        ffiValues, NULL, 0, invoker->rbEnums);
-    
+        ffiValues, callbackParameters, callbackCount, invoker->rbEnums);
+
     rbffi_frame_push(&frame);
-#ifdef HAVE_RB_THREAD_CALL_WITHOUT_GVL
-    /* In Call.c, blocking: true is supported on older ruby variants
-     * without rb_thread_call_without_gvl by allocating on the heap instead
-     * of the stack. Since this functionality is being added later,
-     * we’re skipping support for old rubies here. */
+
     if(unlikely(invoker->blocking)) {
         rbffi_blocking_call_t* bc;
         bc = ALLOCA_N(rbffi_blocking_call_t, 1);
@@ -275,13 +276,11 @@ variadic_invoke(VALUE self, VALUE parameterTypes, VALUE parameterValues)
     } else {
         ffi_call(&cif, FFI_FN(invoker->function), retval, ffiValues);
     }
-#else
-    ffi_call(&cif, FFI_FN(invoker->function), retval, ffiValues);
-#endif
+
     rbffi_frame_pop(&frame);
-    
+
     rbffi_save_errno();
-    
+
     if (RTEST(frame.exc) && frame.exc != Qnil) {
         rb_exc_raise(frame.exc);
     }