ffi 1.3.1-x86-mingw32 → 1.4.0-x86-mingw32

data/README.md

@@ -1,4 +1,4 @@
-# ruby-ffi http://wiki.github.com/ffi/ffi
+# ruby-ffi http://wiki.github.com/ffi/ffi [![Build Status](https://travis-ci.org/ffi/ffi.png?branch=master)](https://travis-ci.org/ffi/ffi)
 
 ## Description
 

data/ext/ffi_c/Call.c

@@ -271,8 +271,10 @@ typedef struct BlockingCall_ {
     FunctionType* info;
     void **ffiValues;
     void* retval;
-    void* stkretval;
     void* params;
+#if !(defined(HAVE_RB_THREAD_BLOCKING_REGION) || defined(HAVE_RB_THREAD_CALL_WITHOUT_GVL))
+    void* stkretval;
+#endif
 } BlockingCall;
 
 static VALUE
@@ -285,6 +287,8 @@ call_blocking_function(void* data)
     return Qnil;
 }
 
+#if !(defined(HAVE_RB_THREAD_BLOCKING_REGION) || defined(HAVE_RB_THREAD_CALL_WITHOUT_GVL))
+
 static VALUE
 do_blocking_call(void *data)
 {
@@ -307,17 +311,16 @@ cleanup_blocking_call(void *data)
     return Qnil;
 }
 
+#endif /* HAVE_RB_THREAD_BLOCKING_REGION */
+
 VALUE
 rbffi_CallFunction(int argc, VALUE* argv, void* function, FunctionType* fnInfo)
 {
     void* retval;
     void** ffiValues;
     FFIStorage* params;
-    VALUE rbReturnValue;
-    
-#if !defined(HAVE_RUBY_THREAD_HAS_GVL_P)
+    VALUE rbReturnValue, exc;    
     rbffi_thread_t oldThread;
-#endif
 
     retval = alloca(MAX(fnInfo->ffi_cif.rtype->size, FFI_SIZEOF_ARG));
     
@@ -328,21 +331,36 @@ rbffi_CallFunction(int argc, VALUE* argv, void* function, FunctionType* fnInfo)
          * due to the way thread switching works on older ruby variants, we
          * cannot allocate anything passed to the blocking function on the stack
          */
+#if defined(HAVE_RB_THREAD_BLOCKING_REGION) || defined(HAVE_RB_THREAD_CALL_WITHOUT_GVL)
+        ffiValues = ALLOCA_N(void *, fnInfo->parameterCount);
+        params = ALLOCA_N(FFIStorage, fnInfo->parameterCount);
+        bc = ALLOCA_N(BlockingCall, 1);
+        bc->retval = retval;
+#else
         ffiValues = ALLOC_N(void *, fnInfo->parameterCount);
         params = ALLOC_N(FFIStorage, fnInfo->parameterCount);
         bc = ALLOC_N(BlockingCall, 1);
+        bc->retval = xmalloc(MAX(fnInfo->ffi_cif.rtype->size, FFI_SIZEOF_ARG));
+        bc->stkretval = retval;
+#endif
         bc->info = fnInfo;
         bc->function = function;
         bc->ffiValues = ffiValues;
         bc->params = params;
-        bc->retval = xmalloc(MAX(fnInfo->ffi_cif.rtype->size, FFI_SIZEOF_ARG));
-        bc->stkretval = retval;
 
         rbffi_SetupCallParams(argc, argv,
             fnInfo->parameterCount, fnInfo->parameterTypes, params, ffiValues,
             fnInfo->callbackParameters, fnInfo->callbackCount, fnInfo->rbEnums);
-        
+
+#if defined(HAVE_RB_THREAD_CALL_WITHOUT_GVL) 
+        rb_thread_call_without_gvl(call_blocking_function, bc, (void *) -1, NULL);
+
+#elif defined(HAVE_RB_THREAD_BLOCKING_REGION)
+        rb_thread_blocking_region(call_blocking_function, bc, (void *) -1, NULL);
+
+#else
         rb_ensure(do_blocking_call, (VALUE) bc, cleanup_blocking_call, (VALUE) bc);
+#endif
         
     } else {
 
@@ -353,15 +371,16 @@ rbffi_CallFunction(int argc, VALUE* argv, void* function, FunctionType* fnInfo)
             fnInfo->parameterCount, fnInfo->parameterTypes, params, ffiValues,
             fnInfo->callbackParameters, fnInfo->callbackCount, fnInfo->rbEnums);
 
-#if !defined(HAVE_RUBY_THREAD_HAS_GVL_P)
         oldThread = rbffi_active_thread;
         rbffi_active_thread = rbffi_thread_self();
-#endif
+        
         ffi_call(&fnInfo->ffi_cif, FFI_FN(function), retval, ffiValues);
 
-#if !defined(HAVE_RUBY_THREAD_HAS_GVL_P)
+        exc = rbffi_active_thread.exc;
         rbffi_active_thread = oldThread;
-#endif
+        if (exc != Qnil) {
+            rb_exc_raise(exc);
+        }
     }
 
     if (unlikely(!fnInfo->ignoreErrno)) {

data/ext/ffi_c/DynamicLibrary.c

@@ -23,7 +23,7 @@
 #ifndef _MSC_VER
 #  include <stdint.h>
 #endif
-#if defined(_WIN32) || defined(__WIN32__)
+#if (defined(_WIN32) || defined(__WIN32__)) && !defined(__CYGWIN__)
 # include <winsock2.h>
 # define _WINSOCKAPI_
 # include <windows.h>
@@ -59,7 +59,7 @@ static void symbol_mark(LibrarySymbol* sym);
 
 static VALUE LibraryClass = Qnil, SymbolClass = Qnil;
 
-#if defined(_WIN32) || defined(__WIN32__)
+#if (defined(_WIN32) || defined(__WIN32__)) && !defined(__CYGWIN__)
 static void* dl_open(const char* name, int flags);
 static void dl_error(char* buf, int size);
 #define dl_sym(handle, name) GetProcAddress(handle, name)
@@ -123,6 +123,15 @@ library_initialize(VALUE self, VALUE libname, VALUE libflags)
                 libname != Qnil ? StringValueCStr(libname) : "[current process]",
                 errmsg);
     }
+#ifdef __CYGWIN__
+    // On Cygwin 1.7.17 "dlsym(dlopen(0,0), 'getpid')" fails. (dlerror: "No such process")
+    // As a workaround we can use "dlsym(RTLD_DEFAULT, 'getpid')" instead.
+    // Since 0 == RTLD_DEFAULT we won't call dl_close later.
+    if (libname == Qnil) {
+        dl_close(library->handle);
+        library->handle = RTLD_DEFAULT;
+    }
+#endif
     rb_iv_set(self, "@name", libname != Qnil ? libname : rb_str_new2("[current process]"));
     return self;
 }
@@ -164,7 +173,7 @@ library_free(Library* library)
     xfree(library);
 }
 
-#if defined(_WIN32) || defined(__WIN32__)
+#if (defined(_WIN32) || defined(__WIN32__)) && !defined(__CYGWIN__)
 static void*
 dl_open(const char* name, int flags)
 {

data/ext/ffi_c/Function.c

@@ -78,7 +78,8 @@ static void function_free(Function *);
 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);
+static VALUE callback_with_gvl(void* data);
+static VALUE save_callback_exception(void* data, VALUE exc);
 
 #define DEFER_ASYNC_CALLBACK 1
 
@@ -458,12 +459,9 @@ callback_invoke(ffi_cif* cif, void* retval, void** parameters, void* user_data)
     cb.done = false;
 
     if (rbffi_thread_has_gvl_p()) {
-        callback_with_gvl(&cb);
+        rbffi_active_thread.exc = Qnil;
+        rb_rescue2(callback_with_gvl, &cb, save_callback_exception, &cb, rb_eException, (VALUE) 0);
     
-#if defined(HAVE_RUBY_NATIVE_THREAD_P) && defined (HAVE_RB_THREAD_CALL_WITH_GVL)
-    } else if (ruby_native_thread_p()) {
-        rb_thread_call_with_gvl(callback_with_gvl, &cb);
-#endif
 #if defined(DEFER_ASYNC_CALLBACK) && !defined(_WIN32)
     } else {
         bool empty = false;
@@ -536,7 +534,7 @@ struct async_wait {
 static VALUE async_cb_wait(void *);
 static void async_cb_stop(void *);
 
-#if defined(HAVE_RB_THREAD_BLOCKING_REGION)
+#if defined(HAVE_RB_THREAD_BLOCKING_REGION) || defined(HAVE_RB_THREAD_CALL_WITHOUT_GVL)
 static VALUE
 async_cb_event(void* unused)
 {
@@ -544,7 +542,11 @@ async_cb_event(void* unused)
 
     w.stop = false;
     while (!w.stop) {
+#if defined(HAVE_RB_THREAD_CALL_WITHOUT_GVL)
+        rb_thread_call_without_gvl(async_cb_wait, &w, async_cb_stop, &w);
+#else
         rb_thread_blocking_region(async_cb_wait, &w, async_cb_stop, &w);
+#endif
         if (w.cb != NULL) {
             /* Start up a new ruby thread to run the ruby callback */
             rb_thread_create(async_cb_call, w.cb);
@@ -713,7 +715,7 @@ async_cb_call(void *data)
 #endif
 
 
-static void*
+static VALUE
 callback_with_gvl(void* data)
 {
     struct gvl_callback* cb = (struct gvl_callback *) data;
@@ -901,9 +903,19 @@ callback_with_gvl(void* data)
             break;
     }
 
-    return NULL;
+    return Qnil;
 }
 
+static VALUE 
+save_callback_exception(void* data, VALUE exc)
+{
+    struct gvl_callback* cb = (struct gvl_callback *) data;
+    
+    memset(cb->retval, 0, ((Function *) cb->closure->info)->info->returnType->ffiType->size);
+    rbffi_active_thread.exc = exc;
+    
+    return Qnil;
+}
 
 static bool
 callback_prep(void* ctx, void* code, Closure* closure, char* errmsg, size_t errmsgsize)

data/ext/ffi_c/Thread.c

@@ -39,7 +39,6 @@ typedef int bool;
 #include "Thread.h"
 
 
-#ifndef HAVE_RUBY_THREAD_HAS_GVL_P
 rbffi_thread_t rbffi_active_thread;
 
 rbffi_thread_t
@@ -52,6 +51,7 @@ rbffi_thread_self()
     self.id = pthread_self();
 #endif
     self.valid = true;
+    self.exc = Qnil;
 
     return self;
 }
@@ -76,7 +76,6 @@ rbffi_thread_has_gvl_p(void)
     return rbffi_active_thread.valid && pthread_equal(rbffi_active_thread.id, pthread_self());
 #endif
 }
-#endif /* HAVE_RUBY_THREAD_HAS_GVL_P */
 
 #ifndef HAVE_RB_THREAD_BLOCKING_REGION
 
@@ -292,34 +291,6 @@ rbffi_thread_blocking_region(VALUE (*func)(void *), void *data1, void (*ubf)(voi
     return thr->retval;
 }
 
-
-#if 0
-
-/*
- * FIXME: someone needs to implement something similar to the posix pipe based
- * blocking region implementation above for ruby1.8.x on win32
- */
-VALUE
-rbffi_thread_blocking_region(VALUE (*func)(void *), void *data1, void (*ubf)(void *), void *data2)
-{
-#if !defined(HAVE_RUBY_THREAD_HAS_GVL_P)
-    rbffi_thread_t oldThread;
-#endif
-    VALUE res;
-#if !defined(HAVE_RUBY_THREAD_HAS_GVL_P)
-    oldThread = rbffi_active_thread;
-    rbffi_active_thread = rbffi_thread_self();
-#endif
-
-    res = (*func)(data1);
-
-#if !defined(HAVE_RUBY_THREAD_HAS_GVL_P)
-    rbffi_active_thread = oldThread;
-#endif
-  return res;
-}
-#endif
-
 #endif /* !_WIN32 */
 
 #endif /* HAVE_RB_THREAD_BLOCKING_REGION */

data/ext/ffi_c/Thread.h

@@ -54,6 +54,7 @@ typedef struct {
     pthread_t id;
 #endif
     bool valid;
+    VALUE exc;
 } rbffi_thread_t;
 
 extern rbffi_thread_t rbffi_active_thread;

data/ext/ffi_c/Variadic.c

@@ -163,9 +163,9 @@ variadic_invoke(VALUE self, VALUE parameterTypes, VALUE parameterValues)
     VALUE* argv;
     int paramCount = 0, i;
     ffi_status ffiStatus;
-#ifndef HAVE_RUBY_THREAD_HAS_GVL_P
+    VALUE exc;
     rbffi_thread_t oldThread;
-#endif
+
     Check_Type(parameterTypes, T_ARRAY);
     Check_Type(parameterValues, T_ARRAY);
 
@@ -239,17 +239,17 @@ variadic_invoke(VALUE self, VALUE parameterTypes, VALUE parameterValues)
 
     rbffi_SetupCallParams(paramCount, argv, -1, paramTypes, params,
         ffiValues, NULL, 0, invoker->rbEnums);
-#ifndef HAVE_RUBY_THREAD_HAS_GVL_P
     oldThread = rbffi_active_thread;
     rbffi_active_thread = rbffi_thread_self();
-#endif
 
     ffi_call(&cif, FFI_FN(invoker->function), retval, ffiValues);
 
-#ifndef HAVE_RUBY_THREAD_HAS_GVL_P
+    exc = rbffi_active_thread.exc;
     rbffi_active_thread = oldThread;
-#endif
-
+    if (exc != Qnil) {
+        rb_exc_raise(exc);
+    }
+    
     rbffi_save_errno();
 
     return rbffi_NativeValue_ToRuby(invoker->returnType, invoker->rbReturnType, retval);

data/ext/ffi_c/extconf.rb

@@ -24,8 +24,8 @@ if !defined?(RUBY_ENGINE) || RUBY_ENGINE == 'ruby' || RUBY_ENGINE == 'rbx'
   end
   
   have_func('rb_thread_blocking_region')
-  have_func('ruby_native_thread_p')
   have_func('rb_thread_call_with_gvl')
+  have_func('rb_thread_call_without_gvl')
   have_func('ffi_prep_cif_var')
   
   $defs << "-DHAVE_EXTCONF_H" if $defs.empty? # needed so create_header works

data/ffi.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'ffi'
-  s.version = '1.3.1'
+  s.version = '1.4.0'
   s.author = 'Wayne Meissner'
   s.email = 'wmeissner@gmail.com'
   s.homepage = 'http://wiki.github.com/ffi/ffi'

data/lib/ffi/platform.rb

@@ -80,14 +80,21 @@ module FFI
 
     
 
-    LIBPREFIX = IS_WINDOWS ? '' : 'lib'
+    LIBPREFIX = case OS
+    when /windows/
+      ''
+    when /cygwin/
+      'cyg'
+    else
+      'lib'
+    end
 
     LIBSUFFIX = case OS
     when /darwin/
       'dylib'
     when /linux|bsd|solaris/
       'so'
-    when /windows/
+    when /windows|cygwin/
       'dll'
     else
       # Punt and just assume a sane unix (i.e. anything but AIX)
@@ -98,6 +105,8 @@ module FFI
       RbConfig::CONFIG['RUBY_SO_NAME'].split('-')[-2] + '.dll'
     elsif IS_GNU
       GNU_LIBC
+    elsif OS == 'cygwin'
+      "cygwin1.dll"
     else
       "#{LIBPREFIX}c.#{LIBSUFFIX}"
     end

data/lib/ffi/platform/i386-cygwin/types.conf

@@ -0,0 +1,3 @@
+rbx.platform.typedef.size_t = uint
+rbx.platform.typedef.ptrdiff_t = int
+rbx.platform.typedef.ssize_t = int

data/spec/ffi/buffer_spec.rb

@@ -239,3 +239,13 @@ describe "Buffer#size" do
     buf.size.should == 14
   end
 end
+
+describe "Buffer#initialize" do
+  it "with block should execute block" do
+    block_executed = false
+    FFI::Buffer.new(:pointer) do |ptr|
+      block_executed = true
+    end
+    block_executed.should be_true
+  end
+end

data/spec/ffi/library_spec.rb

@@ -89,6 +89,14 @@ describe "Library" do
         end.getpid.should == Process.pid
       }.should raise_error(LoadError)
     end
+    it "attach_function :bool_return_true from [ File.expand_path(#{TestLibrary::PATH.inspect}) ]" do
+      Module.new do |m|
+        m.extend FFI::Library
+        ffi_lib File.expand_path(TestLibrary::PATH)
+        attach_function :bool_return_true, [ ], :bool
+        m.bool_return_true.should == true
+      end
+    end
   end
 
   def gvar_lib(name, type)

data/spec/ffi/rbx/memory_pointer_spec.rb

@@ -112,4 +112,12 @@ describe "MemoryPointer" do
     m.write_long(0x12345678)
     m.read_pointer.null?.should == false
   end
+  
+  it "initialize with block should execute block" do
+    block_executed = false
+    FFI::MemoryPointer.new(:pointer) do |ptr|
+      block_executed = true
+    end
+    block_executed.should be_true
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ffi
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 7
   prerelease: 
   segments: 
   - 1
-  - 3
-  - 1
-  version: 1.3.1
+  - 4
+  - 0
+  version: 1.4.0
 platform: x86-mingw32
 authors: 
 - Wayne Meissner
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-01-10 00:00:00 Z
+date: 2013-02-21 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   prerelease: false
@@ -417,6 +417,7 @@ files:
 - lib/ffi/managedstruct.rb
 - lib/ffi/memorypointer.rb
 - lib/ffi/platform/arm-linux/types.conf
+- lib/ffi/platform/i386-cygwin/types.conf
 - lib/ffi/platform/i386-darwin/types.conf
 - lib/ffi/platform/i386-freebsd/types.conf
 - lib/ffi/platform/i386-linux/types.conf
@@ -455,7 +456,6 @@ files:
 - lib/ffi/union.rb
 - lib/ffi/variadic.rb
 - lib/ffi.rb
-- lib/Lib.iml
 - spec/ffi/async_callback_spec.rb
 - spec/ffi/bool_spec.rb
 - spec/ffi/buffer_spec.rb

data/lib/Lib.iml

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="RUBY_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="gem" name="Gem">
-      <configuration>
-        <option name="GEM_APP_ROOT_PATH" value="" />
-        <option name="GEM_APP_TEST_PATH" value="" />
-        <option name="GEM_APP_LIB_PATH" value="" />
-      </configuration>
-    </facet>
-  </component>
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$" isTestSource="false" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>
-