ffi 1.9.18 → 1.9.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 310481484c2ef881dc83069461236a238e31614b
-  data.tar.gz: 951d6446172624561da969bd47db63a88eacb01d
+SHA256:
+  metadata.gz: 286fc5e69721d659cb72bba4dbafc0a65ce8ddd3d85432eefe94c4f8fae78d6c
+  data.tar.gz: e1395b53a83cd497c8fe32176d029f0a5daf47de36a40390f6fadc2d478cc748
 SHA512:
-  metadata.gz: d839e3af476ba00b2c80063aa47455b47b734b79b6435a8bfb3ca8aa875fad89e7cbdc7d1874f1d136f6dbc8b0b5d7dc53286d1e546197c841ff5bcbdbbb7f77
-  data.tar.gz: 292b7cf397c8eadd3d7d300168deffedae37c95bc6a72a5f9da2a0202b92934f1e62165e5c721849768e44cc1086390e92044422f9ed6a0406cac0d488e9b865
+  metadata.gz: 5538683e786da7e3c4ec7665f9e1ca3cfdd6ec2df3aaf3529b008f3acaf39b840889fe8cbdc8f19ecc1ea979882508a4b4e284ec59d1dd43ef6d6fa7062ce4c3
+  data.tar.gz: b5cca527e86e49ac8e3d8d157a907f9601f68d1ccaf06fd922d7b3706ae1c5df4ff1539be2305fde2db7d357377530a76238082bd0f8577fe5d2b79a6936c8ed

data/.gitignore

@@ -0,0 +1,22 @@
+doc/
+bin/
+.yardoc
+*.orig
+nbproject/private
+pkg
+*.orig
+*.rej
+*.patch
+*.diff
+build
+*.so
+*.[oa]
+core
+lib/ffi/types.conf
+lib/ffi_c.bundle
+lib/ffi_c.so
+vendor
+.bundle
+Gemfile.lock
+types_log
+*.gem

data/.gitmodules

@@ -0,0 +1,3 @@
+[submodule "ext/ffi_c/libffi"]
+	path = ext/ffi_c/libffi
+	url = https://github.com/libffi/libffi.git

data/.travis.yml

@@ -0,0 +1,52 @@
+dist: trusty
+sudo: false
+group: beta
+language: ruby
+before_install:
+  - gem install bundler
+script:
+  - bundle exec rake compile || bundle exec rake compile
+  - bundle exec rake test
+os:
+  - linux
+  - osx
+rvm:
+  - 1.9.3
+  - 2.0.0
+  - 2.1
+  - 2.2.8
+  - 2.3.5
+  - 2.4.3
+  - 2.5.0
+  - ruby-head
+  - rbx
+  - system
+env:
+  - CC=gcc
+  - CC=clang
+matrix:
+  allow_failures:
+    - rvm: system
+    - os: osx
+      rvm: 2.0.0
+    - os: osx
+      rvm: ruby-head
+    - rvm: rbx
+    - rvm: rbx-head
+    - rvm: 1.9.3
+  exclude: # ruby 2.4.2 needs build with xcode9 or later on osx
+    - os: osx
+      rvm: 2.4.2
+  include:
+    - os: osx
+      osx_image: xcode9.1
+      rvm: 2.4.2
+      env:
+      - CC=gcc
+    - os: osx
+      osx_image: xcode9.1
+      rvm: 2.4.2
+      env:
+      - CC=clang
+after_failure:
+  - "find build -name mkmf.log | xargs cat"

data/.yardopts

@@ -0,0 +1,5 @@
+--title "Ruby FFI"
+--charset UTF-8
+--private
+lib/**/*.rb
+ext/**/*.c

data/Gemfile

@@ -0,0 +1,15 @@
+source 'https://rubygems.org'
+
+group :development do
+  gem 'rake', '~> 10.1'
+  gem 'rake-compiler', '~> 1.0.3'
+  gem 'rake-compiler-dock', '~> 0.6.2'
+  gem 'rspec', '~> 3.0'
+  gem 'rubygems-tasks', '~> 0.2.4', :require => 'rubygems/tasks'
+  gem "rubysl", "~> 2.0", :platforms => 'rbx'
+end
+
+group :doc do
+  gem 'kramdown'
+  gem 'yard', '~> 0.9'
+end

data/{spec/ffi/LICENSE.SPECS → LICENSE.SPECS}

@@ -1,4 +1,4 @@
-Copyright (c) 2008-2014 Ruby-FFI contributors
+Copyright (c) 2008-2012 Ruby-FFI contributors
 
 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation

data/README.md

@@ -1,4 +1,4 @@
-# ruby-ffi https://wiki.github.com/ffi/ffi [![Build Status](https://travis-ci.org/ffi/ffi.png?branch=master)](https://travis-ci.org/ffi/ffi)
+# ruby-ffi https://wiki.github.com/ffi/ffi [![Build Status](https://travis-ci.org/ffi/ffi.png?branch=master)](https://travis-ci.org/ffi/ffi) [![Build status Windows](https://ci.appveyor.com/api/projects/status/r8wxn1sd4s794gg1/branch/master?svg=true)](https://ci.appveyor.com/project/larskanis/ffi-aofqa/branch/master)
 
 ## Description
 
@@ -43,8 +43,6 @@ At a minimum, you will need:
 * A C compiler (e.g. Xcode on OSX, gcc on everything else)
 * libffi development library - this is commonly in the libffi-dev or libffi-devel
 
-On Linux systems running with [PaX](https://en.wikipedia.org/wiki/PaX) (Gentoo, Alpine, etc.) FFI may trigger `mprotrect` errors. You may need to disable [mprotect](https://en.wikibooks.org/wiki/Grsecurity/Appendix/Grsecurity_and_PaX_Configuration_Options#Restrict_mprotect.28.29) for ruby (`paxctl -m [/path/to/ruby]`) for the time being until a solution is found.
-
 ## Installation
 
 From rubygems:
@@ -54,8 +52,9 @@ From rubygems:
 or from the git repository on github:
 
     git clone git://github.com/ffi/ffi.git
+    git submodule update --init --recursive
     cd ffi
-    rake gem:install
+    rake install
 
 ## License
 

data/Rakefile

@@ -65,7 +65,18 @@ OS = case RbConfig::CONFIG['host_os'].downcase
     RbConfig::CONFIG['host_os'].downcase
   end
 
-GMAKE = system('which gmake >/dev/null') && 'gmake' || 'make'
+def which(name)
+  exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
+  ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
+    exts.each do |ext|
+      app = File.join(path, name+ext)
+      return app if File.executable? app
+    end
+  end
+  nil
+end
+
+GMAKE = which('gmake').nil? ? 'make' : 'gmake'
 
 LIBTEST = "build/libtest.#{LIBEXT}"
 BUILD_DIR = "build"
@@ -89,7 +100,7 @@ else
 end
 
 desc "Build all packages"
-task :package => 'gem:package'
+task :package => %w[ gem:java gem:windows ]
 
 CLOBBER.include 'lib/ffi/types.conf'
 CLOBBER.include 'pkg'
@@ -173,10 +184,11 @@ if USE_RAKE_COMPILER
     ext.tmp_dir = BUILD_DIR                                   # temporary folder used during compilation.
     ext.cross_compile = true                                  # enable cross compilation (requires cross compile toolchain)
     ext.cross_platform = %w[i386-mingw32 x64-mingw32]                     # forces the Windows platform instead of the default one
+    ext.cross_compiling do |spec|
+      spec.files.reject! { |path| File.fnmatch?('ext/*', path) }
+    end
   end
 
-  ENV['RUBY_CC_VERSION'] ||= '1.8.7:1.9.3:2.0.0:2.1.6:2.2.2:2.3.0'
-
   # To reduce the gem file size strip mingw32 dlls before packaging
   ENV['RUBY_CC_VERSION'].to_s.split(':').each do |ruby_version|
     task "build/i386-mingw32/stage/lib/#{ruby_version[/^\d+\.\d+/]}/ffi_c.so" do |t|
@@ -191,7 +203,31 @@ if USE_RAKE_COMPILER
   desc "build a windows gem without all the ceremony."
   task "gem:windows" do
     require "rake_compiler_dock"
-    RakeCompilerDock.sh "bundle && rake cross native gem MAKE='nice make -j`nproc`'"
+    RakeCompilerDock.sh "sudo apt-get update && sudo apt-get install -y libltdl-dev && bundle && rake cross native gem MAKE='nice make -j`nproc`'"
+  end
+end
+
+directory "ext/ffi_c/libffi"
+file "ext/ffi_c/libffi/autogen.sh" => "ext/ffi_c/libffi" do
+  warn "Downloading libffi ..."
+  sh "git submodule update --init --recursive"
+end
+
+LIBFFI_GIT_FILES = `git --git-dir ext/ffi_c/libffi/.git ls-files -z`.split("\x0")
+
+# Generate files in gemspec but not in libffi's git repo by running autogen.sh
+gem_spec.files.select do |f|
+  f =~ /ext\/ffi_c\/libffi\/(.*)/ && !LIBFFI_GIT_FILES.include?($1)
+end.each do |f|
+  file f => "ext/ffi_c/libffi/autogen.sh" do
+    chdir "ext/ffi_c/libffi" do
+      sh "sh ./autogen.sh"
+    end
+    touch f
+    if gem_spec.files != Gem::Specification.load('./ffi.gemspec').files
+      warn "gemspec files have changed -> Please restart rake!"
+      exit 1
+    end
   end
 end
 

data/appveyor.yml

@@ -0,0 +1,22 @@
+install:
+  - SET PATH=C:\Ruby%RUBYVER%\bin;%PATH%
+  - SET RAKEOPT=-rdevkit
+  - ps: |
+      if ($env:RUBYVER -like "*head*") {
+        $(new-object net.webclient).DownloadFile("https://github.com/oneclick/rubyinstaller2/releases/download/rubyinstaller-head/rubyinstaller-$env:RUBYVER.exe", "$pwd/ruby-setup.exe")
+        cmd /c ruby-setup.exe /verysilent /dir=C:/Ruby$env:RUBYVER
+      }
+  - ridk version
+  - gem --version
+  - gem install bundler --quiet --no-ri --no-rdoc
+  - bundle install
+build: off
+build_script:
+  - bundle exec rake compile || bundle exec rake compile
+test_script:
+  - bundle exec rake test
+environment:
+  matrix:
+    - RUBYVER: "head-x64"
+    - RUBYVER: 24
+    - RUBYVER: 25-x64

data/ext/ffi_c/AbstractMemory.c

@@ -49,8 +49,13 @@
 #include "Function.h"
 #include "LongDouble.h"
 
-#ifndef PRIsVALUE
+#ifdef PRIsVALUE
+# define RB_OBJ_CLASSNAME(obj) rb_obj_class(obj)
+# define RB_OBJ_STRING(obj) (obj)
+#else
 # define PRIsVALUE "s"
+# define RB_OBJ_CLASSNAME(obj) rb_obj_classname(obj)
+# define RB_OBJ_STRING(obj) StringValueCStr(obj)
 #endif
 
 static inline char* memory_address(VALUE self);

data/ext/ffi_c/Call.c

@@ -62,28 +62,7 @@
 #include "Thread.h"
 #include "LongDouble.h"
 
-#ifdef USE_RAW
-#  ifndef __i386__
-#    error "RAW argument packing only supported on i386"
-#  endif
-
-#define INT8_ADJ (4)
-#define INT16_ADJ (4)
-#define INT32_ADJ (4)
-#define INT64_ADJ (8)
-#define LONG_ADJ (sizeof(long))
-#define FLOAT32_ADJ (4)
-#define FLOAT64_ADJ (8)
-#define ADDRESS_ADJ (sizeof(void *))
-#define LONGDOUBLE_ADJ (ffi_type_longdouble.alignment)
-
-#endif /* USE_RAW */
-
-#ifdef USE_RAW
-#  define ADJ(p, a) ((p) = (FFIStorage*) (((char *) p) + a##_ADJ))
-#else
-#  define ADJ(p, a) (++(p))
-#endif
+#define ADJ(p, a) (++(p))
 
 static void* callback_param(VALUE proc, VALUE cbinfo);
 static inline void* getPointer(VALUE value, int type);

data/ext/ffi_c/Call.h

@@ -39,16 +39,7 @@
 extern "C" {
 #endif
 
-#if defined(__i386__) && \
-  (defined(HAVE_RAW_API) || defined(USE_INTERNAL_LIBFFI)) && \
-  !defined(_WIN32) && !defined(__WIN32__)
-#  define USE_RAW
-#endif
 
-#if (defined(__i386__) || defined(__x86_64__)) && !(defined(_WIN32) || defined(__WIN32__))
-#  define BYPASS_FFI 1
-#endif
-    
 typedef union {
 #ifdef USE_RAW
     signed int s8, s16, s32;

data/ext/ffi_c/Closure.c

@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2009, 2010 Wayne Meissner
+ * Copyright (c) 2008-2016, Ruby FFI project contributors
+ * All rights reserved.
+ *
+ * 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 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 <ffi.h>
+#include "Closure.h"
+#include "rbffi.h"
+
+Closure* rbffi_Closure_Alloc(void)
+{
+    Closure *self;
+
+    self = xmalloc(sizeof(Closure));
+    self->libffi_closure = ffi_closure_alloc(sizeof(ffi_closure), &self->libffi_trampoline);
+    if (!self->libffi_closure) {
+        return NULL;
+    }
+
+    return self;
+}
+
+void rbffi_Closure_Free(Closure *self)
+{
+    ffi_closure_free(self->libffi_closure);
+    free(self);
+}
+
+void rbffi_Closure_Init(VALUE moduleFFI)
+{
+}

data/ext/ffi_c/{ClosurePool.h → Closure.h}

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2009, 2010 Wayne Meissner
- * Copyright (c) 2008-2013, Ruby FFI project contributors
+ * Copyright (c) 2008-2016, Ruby FFI project contributors
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -26,32 +26,22 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef RUBYFFI_CLOSUREPOOL_H
-#define RUBYFFI_CLOSUREPOOL_H
+#ifndef RUBYFFI_CLOSURE_H
+#define RUBYFFI_CLOSURE_H
 
-typedef struct ClosurePool_ ClosurePool;
-typedef struct Closure_ Closure;
+#include <ruby.h>
 
-struct Closure_ {
-    void* info;      /* opaque handle for storing closure-instance specific data */
-    void* function;  /* closure-instance specific function, called by custom trampoline */
-    void* code;      /* The native trampoline code location */
-    struct ClosurePool_* pool;
-    Closure* next;
-};
+typedef struct Closure_ {
+    void* info;              /* Data to pass when calling */
+    void* function;          /* Function to call */
+    void* libffi_trampoline; /* Calls .function */
+    void *libffi_closure;    /* Allocates .libffi_trampoline */
+} Closure;
 
-void rbffi_ClosurePool_Init(VALUE module);
-
-ClosurePool* rbffi_ClosurePool_New(int closureSize, 
-        bool (*prep)(void* ctx, void *code, Closure* closure, char* errbuf, size_t errbufsize),
-        void* ctx);
-
-void rbffi_ClosurePool_Free(ClosurePool *);
-
-Closure* rbffi_Closure_Alloc(ClosurePool *);
+Closure* rbffi_Closure_Alloc();
 void rbffi_Closure_Free(Closure *);
 
-void* rbffi_Closure_GetCodeAddress(Closure *);
+void rbffi_Closure_Init(VALUE ffiModule);
 
-#endif /* RUBYFFI_CLOSUREPOOL_H */
+#endif /* RUBYFFI_CLOSURE_H */
 

data/ext/ffi_c/Function.c

@@ -64,7 +64,7 @@
 #include "Type.h"
 #include "LastError.h"
 #include "Call.h"
-#include "ClosurePool.h"
+#include "Closure.h"
 #include "MappedType.h"
 #include "Thread.h"
 #include "LongDouble.h"
@@ -297,6 +297,7 @@ static VALUE
 function_init(VALUE self, VALUE rbFunctionInfo, VALUE rbProc)
 {
     Function* fn = NULL;
+    ffi_status ffiStatus;
 
     Data_Get_Struct(self, Function, fn);
 
@@ -311,13 +312,6 @@ function_init(VALUE self, VALUE rbFunctionInfo, VALUE rbProc)
         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) {
-            fn->info->closurePool = rbffi_ClosurePool_New(sizeof(ffi_closure), callback_prep, fn->info);
-            if (fn->info->closurePool == NULL) {
-                rb_raise(rb_eNoMemError, "failed to create closure pool");
-            }
-        }
-
 #if defined(DEFER_ASYNC_CALLBACK)
         if (async_cb_thread == Qnil) {
 #if !(defined(HAVE_RB_THREAD_BLOCKING_REGION) || defined(HAVE_RB_THREAD_CALL_WITHOUT_GVL)) && defined(_WIN32)
@@ -332,10 +326,22 @@ function_init(VALUE self, VALUE rbFunctionInfo, VALUE rbProc)
 
 #endif
 
-        fn->closure = rbffi_Closure_Alloc(fn->info->closurePool);
+        fn->closure = rbffi_Closure_Alloc();
         fn->closure->info = fn;
-        fn->base.memory.address = fn->closure->code;
+
+        ffiStatus = ffi_prep_closure_loc(fn->closure->libffi_closure,
+                &fn->info->ffi_cif, /* callback signature */
+                callback_invoke,
+                fn->closure, /* user_data for callback_invoke */
+                fn->closure->libffi_trampoline);
+        if (ffiStatus != FFI_OK) {
+            rb_raise(rb_eRuntimeError, "ffi_prep_closure_loc in function_init failed.  status=%#x",
+                    ffiStatus);
+        }
+
+        fn->base.memory.address = fn->closure->libffi_trampoline;
         fn->base.memory.size = sizeof(*fn->closure);
+
         fn->autorelease = true;
 
     } else {
@@ -939,21 +945,6 @@ save_callback_exception(void* data, VALUE exc)
     return Qnil;
 }
 
-static bool
-callback_prep(void* ctx, void* code, Closure* closure, char* errmsg, size_t errmsgsize)
-{
-    FunctionType* fnInfo = (FunctionType *) ctx;
-    ffi_status ffiStatus;
-
-    ffiStatus = ffi_prep_closure(code, &fnInfo->ffi_cif, callback_invoke, closure);
-    if (ffiStatus != FFI_OK) {
-        snprintf(errmsg, errmsgsize, "ffi_prep_closure failed.  status=%#x", ffiStatus);
-        return false;
-    }
-
-    return true;
-}
-
 void
 rbffi_Function_Init(VALUE moduleFFI)
 {

data/ext/ffi_c/Function.h

@@ -46,7 +46,7 @@ typedef struct FunctionType_ FunctionType;
 
 #include "Type.h"
 #include "Call.h"
-#include "ClosurePool.h"
+#include "Closure.h"
 
 struct FunctionType_ {
     Type type; /* The native type of a FunctionInfo object */
@@ -60,7 +60,6 @@ struct FunctionType_ {
     ffi_type** ffiParameterTypes;
     ffi_cif ffi_cif;
     Invoker invoke;
-    ClosurePool* closurePool;
     int parameterCount;
     int flags;
     ffi_abi abi;

data/ext/ffi_c/FunctionInfo.c

@@ -72,7 +72,6 @@ fntype_allocate(VALUE klass)
     fnInfo->rbParameterTypes = Qnil;
     fnInfo->rbEnums = Qnil;
     fnInfo->invoke = rbffi_CallFunction;
-    fnInfo->closurePool = NULL;
 
     return obj;
 }
@@ -95,9 +94,6 @@ fntype_free(FunctionType* fnInfo)
     xfree(fnInfo->ffiParameterTypes);
     xfree(fnInfo->nativeParameterTypes);
     xfree(fnInfo->callbackParameters);
-    if (fnInfo->closurePool != NULL) {
-        rbffi_ClosurePool_Free(fnInfo->closurePool);
-    }
     xfree(fnInfo);
 }