ffi 1.10.0 → 1.14.2

data/ext/ffi_c/Struct.h

@@ -34,11 +34,7 @@
 #include "extconf.h"
 #include "AbstractMemory.h"
 #include "Type.h"
-#ifdef RUBY_1_9
 #include <ruby/st.h>
-#else
-#include <st.h>
-#endif
 
 #ifdef	__cplusplus
 extern "C" {
@@ -73,11 +69,21 @@ extern "C" {
         int size;
         int align;
         ffi_type** ffiTypes;
-        struct st_table* fieldSymbolTable;
+
+        /*
+        * We use the fieldName's minor 8 Bits as index to a 256 entry cache.
+        * This avoids full ruby hash lookups for repeated lookups.
+        */
+        #define FIELD_CACHE_LOOKUP(this, sym) ( &(this)->cache_row[((sym) >> 8) & 0xff] )
+
+        struct field_cache_entry {
+          VALUE fieldName;
+          StructField *field;
+        } cache_row[0x100];
 
         /** The number of reference tracking fields in this struct */
         int referenceFieldCount;
-        
+
         VALUE rbFieldNames;
         VALUE rbFieldMap;
         VALUE rbFields;

data/ext/ffi_c/StructByValue.c

@@ -32,13 +32,8 @@
 #endif
 #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 <errno.h>
 #include <ruby.h>
 

data/ext/ffi_c/StructLayout.c

@@ -32,12 +32,9 @@
 
 #ifndef _MSC_VER
 # include <sys/param.h>
-# 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 "rbffi.h"
 #include "compat.h"
@@ -138,7 +135,7 @@ struct_field_initialize(int argc, VALUE* argv, VALUE self)
                         && RTEST(rb_funcall2(rbType, rb_intern("reference_required?"), 0, NULL)));
             break;
     }
-    
+
     return self;
 }
 
@@ -239,7 +236,7 @@ static VALUE
 struct_field_put(VALUE self, VALUE pointer, VALUE value)
 {
     StructField* f;
-    
+
     Data_Get_Struct(self, StructField, f);
     if (f->memoryOp == NULL) {
         rb_raise(rb_eArgError, "put not supported for %s", rb_obj_classname(f->rbType));
@@ -261,7 +258,7 @@ static VALUE
 function_field_get(VALUE self, VALUE pointer)
 {
     StructField* f;
-    
+
     Data_Get_Struct(self, StructField, f);
 
     return rbffi_Function_NewInstance(f->rbType, (*rbffi_AbstractMemoryOps.pointer->get)(MEMORY(pointer), f->offset));
@@ -272,7 +269,7 @@ function_field_get(VALUE self, VALUE pointer)
  * @param [AbstractMemory] pointer pointer to a {Struct}
  * @param [Function, Proc] proc
  * @return [Function]
- * Set a {Function} to memory pointed by +pointer+ as a function. 
+ * Set a {Function} to memory pointed by +pointer+ as a function.
  *
  * If a Proc is submitted as +proc+, it is automatically transformed to a {Function}.
  */
@@ -339,19 +336,24 @@ array_field_put(VALUE self, VALUE pointer, VALUE value)
 {
     StructField* f;
     ArrayType* array;
-    
+
 
     Data_Get_Struct(self, StructField, f);
     Data_Get_Struct(f->rbType, ArrayType, array);
-    
+
     if (isCharArray(array) && rb_obj_is_instance_of(value, rb_cString)) {
         VALUE argv[2];
 
         argv[0] = INT2FIX(f->offset);
         argv[1] = value;
 
-        rb_funcall2(pointer, rb_intern("put_string"), 2, argv);
-
+        if (RSTRING_LEN(value) < array->length) {
+            rb_funcall2(pointer, rb_intern("put_string"), 2, argv);
+        } else if (RSTRING_LEN(value) == array->length) {
+            rb_funcall2(pointer, rb_intern("put_bytes"), 2, argv);
+        } else {
+            rb_raise(rb_eIndexError, "String is longer (%ld bytes) than the char array (%d bytes)", RSTRING_LEN(value), array->length);
+        }
     } else {
 #ifdef notyet
         MemoryOp* op;
@@ -419,7 +421,6 @@ struct_layout_allocate(VALUE klass)
     layout->rbFieldMap = Qnil;
     layout->rbFieldNames = Qnil;
     layout->rbFields = Qnil;
-    layout->fieldSymbolTable = st_init_numtable();
     layout->base.ffiType = xcalloc(1, sizeof(*layout->base.ffiType));
     layout->base.ffiType->size = 0;
     layout->base.ffiType->alignment = 0;
@@ -488,7 +489,6 @@ struct_layout_initialize(VALUE self, VALUE fields, VALUE size, VALUE align)
 
 
         layout->ffiTypes[i] = ftype->size > 0 ? ftype : NULL;
-        st_insert(layout->fieldSymbolTable, rbName, rbField);
         rb_hash_aset(layout->rbFieldMap, rbName, rbField);
         rb_ary_push(layout->rbFields, rbField);
         rb_ary_push(layout->rbFieldNames, rbName);
@@ -501,14 +501,14 @@ struct_layout_initialize(VALUE self, VALUE fields, VALUE size, VALUE align)
     return self;
 }
 
-/* 
+/*
  * call-seq: [](field)
  * @param [Symbol] field
  * @return [StructLayout::Field]
  * Get a field from the layout.
  */
 static VALUE
-struct_layout_union_bang(VALUE self) 
+struct_layout_union_bang(VALUE self)
 {
     const ffi_type *alignment_types[] = { &ffi_type_sint8, &ffi_type_sint16, &ffi_type_sint32, &ffi_type_sint64,
                                           &ffi_type_float, &ffi_type_double, &ffi_type_longdouble, NULL };
@@ -602,6 +602,10 @@ struct_layout_mark(StructLayout *layout)
     rb_gc_mark(layout->rbFieldMap);
     rb_gc_mark(layout->rbFieldNames);
     rb_gc_mark(layout->rbFields);
+    /* Clear the cache, to be safe from changes of fieldName VALUE by GC.compact.
+     * TODO: Move cache clearing to compactation callback provided by Ruby-2.7+.
+     */
+    memset(&layout->cache_row, 0, sizeof(layout->cache_row));
 }
 
 static void
@@ -610,7 +614,6 @@ struct_layout_free(StructLayout *layout)
     xfree(layout->ffiTypes);
     xfree(layout->base.ffiType);
     xfree(layout->fields);
-    st_free_table(layout->fieldSymbolTable);
     xfree(layout);
 }
 
@@ -627,7 +630,7 @@ rbffi_StructLayout_Init(VALUE moduleFFI)
      */
     rbffi_StructLayoutClass = rb_define_class_under(moduleFFI, "StructLayout", ffi_Type);
     rb_global_variable(&rbffi_StructLayoutClass);
-    
+
     /*
      * Document-class: FFI::StructLayout::Field
      * A field in a {StructLayout}.

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
 }