ffi 1.10.0 → 1.13.1

data/ext/ffi_c/libffi/testsuite/{libffi.call → libffi.closures}/huge_struct.c

@@ -7,7 +7,7 @@
 
 /* { dg-do run { xfail strongarm*-*-* xscale*-*-* } } */
 /* { dg-options -mlong-double-128 { target powerpc64*-*-linux* } } */
-/* { dg-options -Wformat=0 { target moxie*-*-elf } } */
+/* { dg-options -Wformat=0 { target moxie*-*-elf or1k-*-* } } */
 
 #include "ffitest.h"
 

data/ext/ffi_c/rbffi.h

@@ -44,7 +44,6 @@ extern void rbffi_Type_Init(VALUE ffiModule);
 extern void rbffi_Buffer_Init(VALUE ffiModule);
 extern void rbffi_Invoker_Init(VALUE ffiModule);
 extern void rbffi_Variadic_Init(VALUE ffiModule);
-extern void rbffi_DataConverter_Init(VALUE ffiModule);
 extern VALUE rbffi_AbstractMemoryClass, rbffi_InvokerClass;
 extern int rbffi_type_size(VALUE type);
 extern void rbffi_Thread_Init(VALUE moduleFFI);
@@ -54,4 +53,3 @@ extern void rbffi_Thread_Init(VALUE moduleFFI);
 #endif
 
 #endif	/* RBFFI_RBFFI_H */
-

data/ffi.gemspec

@@ -5,9 +5,17 @@ Gem::Specification.new do |s|
   s.version = FFI::VERSION
   s.author = 'Wayne Meissner'
   s.email = 'wmeissner@gmail.com'
-  s.homepage = 'http://wiki.github.com/ffi/ffi'
+  s.homepage = 'https://github.com/ffi/ffi/wiki'
   s.summary = 'Ruby FFI'
   s.description = 'Ruby FFI library'
+  if s.respond_to?(:metadata)
+    s.metadata['bug_tracker_uri'] = 'https://github.com/ffi/ffi/issues'
+    s.metadata['changelog_uri'] = 'https://github.com/ffi/ffi/blob/master/CHANGELOG.md'
+    s.metadata['documentation_uri'] = 'https://github.com/ffi/ffi/wiki'
+    s.metadata['wiki_uri'] = 'https://github.com/ffi/ffi/wiki'
+    s.metadata['source_code_uri'] = 'https://github.com/ffi/ffi/'
+    s.metadata['mailing_list_uri'] = 'http://groups.google.com/group/ruby-ffi'
+  end
   s.files = `git ls-files -z`.split("\x0").reject do |f|
     f =~ /^(bench|gen|libtest|nbproject|spec)/
   end
@@ -23,14 +31,13 @@ Gem::Specification.new do |s|
   end
 
   s.extensions << 'ext/ffi_c/extconf.rb'
-  s.has_rdoc = false
   s.rdoc_options = %w[--exclude=ext/ffi_c/.*\.o$ --exclude=ffi_c\.(bundle|so)$]
   s.license = 'BSD-3-Clause'
   s.require_paths << 'ext/ffi_c'
-  s.required_ruby_version = '>= 1.9'
-  s.add_development_dependency 'rake', '~> 10.1'
+  s.required_ruby_version = '>= 2.3'
+  s.add_development_dependency 'rake', '~> 13.0'
   s.add_development_dependency 'rake-compiler', '~> 1.0'
-  s.add_development_dependency 'rake-compiler-dock', '~> 0.6.2'
+  s.add_development_dependency 'rake-compiler-dock', '~> 1.0'
   s.add_development_dependency 'rspec', '~> 2.14.1'
   s.add_development_dependency 'rubygems-tasks', "~> 0.2.4"
 end

data/lib/ffi.rb

@@ -1,4 +1,4 @@
-if !defined?(RUBY_ENGINE) || RUBY_ENGINE == 'ruby' || RUBY_ENGINE == 'rbx'
+if RUBY_ENGINE == 'ruby' || RUBY_ENGINE == 'rbx'
   Object.send(:remove_const, :FFI) if defined?(::FFI)
   begin
     require RUBY_VERSION.split('.')[0, 2].join('.') + '/ffi_c'
@@ -8,7 +8,15 @@ if !defined?(RUBY_ENGINE) || RUBY_ENGINE == 'ruby' || RUBY_ENGINE == 'rbx'
 
   require 'ffi/ffi'
 
-elsif defined?(RUBY_ENGINE)
+elsif RUBY_ENGINE == 'jruby' && Gem::Version.new(RUBY_ENGINE_VERSION) >= Gem::Version.new("9.3.pre")
+  JRuby::Util.load_ext("org.jruby.ext.ffi.FFIService")
+  require 'ffi/ffi'
+
+elsif RUBY_ENGINE == 'truffleruby' && Gem::Version.new(RUBY_ENGINE_VERSION) >= Gem::Version.new("20.1.0-dev-a")
+  require 'truffleruby/ffi_backend'
+  require 'ffi/ffi'
+
+else
   # Remove the ffi gem dir from the load path, then reload the internal ffi implementation
   $LOAD_PATH.delete(File.dirname(__FILE__))
   $LOAD_PATH.delete(File.join(File.dirname(__FILE__), 'ffi'))

data/lib/ffi/data_converter.rb

@@ -0,0 +1,67 @@
+#
+# Copyright (C) 2008-2010 Wayne Meissner
+#
+# This file is part of ruby-ffi.
+#
+# 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 THE COPYRIGHT OWNER OR CONTRIBUTORS 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.#
+
+module FFI
+  # This module is used to extend somes classes and give then a common API.
+  #
+  # Most of methods defined here must be overriden.
+  module DataConverter
+    # Get native type.
+    #
+    # @overload native_type(type)
+    #  @param [String, Symbol, Type] type
+    #  @return [Type]
+    #  Get native type from +type+.
+    #
+    # @overload native_type
+    #  @raise {NotImplementedError} This method must be overriden.
+    def native_type(type = nil)
+      if type
+        @native_type = FFI.find_type(type)
+      else
+        native_type = @native_type
+        unless native_type
+          raise NotImplementedError, 'native_type method not overridden and no native_type set'
+        end
+        native_type
+      end
+    end
+
+    # Convert to a native type.
+    def to_native(value, ctx)
+      value
+    end
+
+    # Convert from a native type.
+    def from_native(value, ctx)
+      value
+    end
+  end
+end

data/lib/ffi/ffi.rb

@@ -29,6 +29,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 require 'ffi/platform'
+require 'ffi/data_converter'
 require 'ffi/types'
 require 'ffi/library'
 require 'ffi/errno'
@@ -42,3 +43,4 @@ require 'ffi/io'
 require 'ffi/autopointer'
 require 'ffi/variadic'
 require 'ffi/enum'
+require 'ffi/version'

data/lib/ffi/library.rb

@@ -47,7 +47,7 @@ module FFI
 
     if lib && File.basename(lib) == lib
       lib = Platform::LIBPREFIX + lib unless lib =~ /^#{Platform::LIBPREFIX}/
-      r = Platform::IS_GNU ? "\\.so($|\\.[1234567890]+)" : "\\.#{Platform::LIBSUFFIX}$"
+      r = Platform::IS_WINDOWS || Platform::IS_MAC ? "\\.#{Platform::LIBSUFFIX}$" : "\\.so($|\\.[1234567890]+)"
       lib += ".#{Platform::LIBSUFFIX}" unless lib =~ /#{r}/
     end
 
@@ -65,16 +65,16 @@ module FFI
   #
   # A basic usage may be:
   #  require 'ffi'
-  #  
+  #
   #  module Hello
   #    extend FFI::Library
   #    ffi_lib FFI::Library::LIBC
   #    attach_function 'puts', [ :string ], :int
   #  end
-  #  
+  #
   #  Hello.puts("Hello, World")
   #
-  # 
+  #
   module Library
     CURRENT_PROCESS = FFI::CURRENT_PROCESS
     LIBC = FFI::Platform::LIBC
@@ -87,7 +87,7 @@ module FFI
       raise RuntimeError.new("must only be extended by module") unless mod.kind_of?(Module)
     end
 
-    
+
     # @param [Array] names names of libraries to load
     # @return [Array<DynamicLibrary>]
     # @raise {LoadError} if a library cannot be opened
@@ -394,7 +394,11 @@ module FFI
       options = Hash.new
       options[:convention] = ffi_convention
       options[:enums] = @ffi_enums if defined?(@ffi_enums)
-      cb = FFI::CallbackInfo.new(find_type(ret), native_params, options)
+      ret_type = find_type(ret)
+      if ret_type == Type::STRING
+        raise TypeError, ":string is not allowed as return type of callbacks"
+      end
+      cb = FFI::CallbackInfo.new(ret_type, native_params, options)
 
       # Add to the symbol -> type map (unless there was no name)
       unless name.nil?

data/lib/ffi/platform.rb

@@ -46,6 +46,8 @@ module FFI
       "netbsd"
     when /openbsd/
       "openbsd"
+    when /dragonfly/
+      "dragonflybsd"
     when /sunos|solaris/
       "solaris"
     when /mingw|mswin/
@@ -56,8 +58,10 @@ module FFI
 
     OSVERSION = RbConfig::CONFIG['host_os'].gsub(/[^\d]/, '').to_i
 
+    CPU = RbConfig::CONFIG['host_cpu']
+
     ARCH = case CPU.downcase
-    when /amd64|x86_64/
+    when /amd64|x86_64|x64/
       "x86_64"
     when /i?86|x86|i86pc/
       "i386"
@@ -90,9 +94,10 @@ module FFI
     IS_FREEBSD = is_os("freebsd")
     IS_NETBSD = is_os("netbsd")
     IS_OPENBSD = is_os("openbsd")
+    IS_DRAGONFLYBSD = is_os("dragonfly")
     IS_SOLARIS = is_os("solaris")
     IS_WINDOWS = is_os("windows")
-    IS_BSD = IS_MAC || IS_FREEBSD || IS_NETBSD || IS_OPENBSD
+    IS_BSD = IS_MAC || IS_FREEBSD || IS_NETBSD || IS_OPENBSD || IS_DRAGONFLYBSD
 
     # Add the version for known ABI breaks
     name_version = "12" if IS_FREEBSD && OSVERSION >= 12 # 64-bit inodes
@@ -124,7 +129,11 @@ module FFI
     end
 
     LIBC = if IS_WINDOWS
-      RbConfig::CONFIG['RUBY_SO_NAME'].split('-')[-2] + '.dll'
+      if RbConfig::CONFIG['host_os'] =~ /mingw/i
+        RbConfig::CONFIG['RUBY_SO_NAME'].split('-')[-2] + '.dll'
+      else
+        "ucrtbase.dll"
+      end
     elsif IS_GNU
       GNU_LIBC
     elsif OS == 'cygwin'

data/lib/ffi/platform/aarch64-freebsd/types.conf

@@ -1,128 +1,128 @@
-rbx.platform.typedef.__int8_t = char
-rbx.platform.typedef.__uint8_t = uchar
-rbx.platform.typedef.__int16_t = short
-rbx.platform.typedef.__uint16_t = ushort
-rbx.platform.typedef.__int32_t = int
-rbx.platform.typedef.__uint32_t = uint
-rbx.platform.typedef.__int64_t = long_long
-rbx.platform.typedef.__uint64_t = ulong_long
-rbx.platform.typedef.__int_least8_t = char
-rbx.platform.typedef.__uint_least8_t = uchar
-rbx.platform.typedef.__int_least16_t = short
-rbx.platform.typedef.__uint_least16_t = ushort
-rbx.platform.typedef.__int_least32_t = int
-rbx.platform.typedef.__uint_least32_t = uint
-rbx.platform.typedef.__int_least64_t = long_long
-rbx.platform.typedef.__uint_least64_t = ulong_long
-rbx.platform.typedef.__int_fast8_t = int
-rbx.platform.typedef.__uint_fast8_t = uint
-rbx.platform.typedef.__int_fast16_t = int
-rbx.platform.typedef.__uint_fast16_t = uint
-rbx.platform.typedef.__int_fast32_t = int
-rbx.platform.typedef.__uint_fast32_t = uint
-rbx.platform.typedef.__int_fast64_t = long_long
-rbx.platform.typedef.__uint_fast64_t = ulong_long
-rbx.platform.typedef.__intptr_t = long
-rbx.platform.typedef.__uintptr_t = ulong
-rbx.platform.typedef.__intmax_t = long_long
-rbx.platform.typedef.__uintmax_t = ulong_long
-rbx.platform.typedef.__register_t = long_long
-rbx.platform.typedef.__vaddr_t = ulong
-rbx.platform.typedef.__paddr_t = ulong
-rbx.platform.typedef.__vsize_t = ulong
-rbx.platform.typedef.__psize_t = ulong
 rbx.platform.typedef.__clock_t = int
 rbx.platform.typedef.__clockid_t = int
-rbx.platform.typedef.__off_t = long_long
-rbx.platform.typedef.__ptrdiff_t = long
-rbx.platform.typedef.__size_t = ulong
-rbx.platform.typedef.__ssize_t = long
-rbx.platform.typedef.__time_t = int
-rbx.platform.typedef.__timer_t = int
-rbx.platform.typedef.__wchar_t = int
-rbx.platform.typedef.__wint_t = int
-rbx.platform.typedef.__rune_t = int
-rbx.platform.typedef.__wctrans_t = pointer
-rbx.platform.typedef.__wctype_t = pointer
 rbx.platform.typedef.__cpuid_t = ulong
 rbx.platform.typedef.__dev_t = int
+rbx.platform.typedef.__fd_mask = int
 rbx.platform.typedef.__fixpt_t = uint
 rbx.platform.typedef.__gid_t = uint
 rbx.platform.typedef.__id_t = uint
 rbx.platform.typedef.__in_addr_t = uint
 rbx.platform.typedef.__in_port_t = ushort
 rbx.platform.typedef.__ino_t = uint
+rbx.platform.typedef.__int16_t = short
+rbx.platform.typedef.__int32_t = int
+rbx.platform.typedef.__int64_t = long_long
+rbx.platform.typedef.__int8_t = char
+rbx.platform.typedef.__int_fast16_t = int
+rbx.platform.typedef.__int_fast32_t = int
+rbx.platform.typedef.__int_fast64_t = long_long
+rbx.platform.typedef.__int_fast8_t = int
+rbx.platform.typedef.__int_least16_t = short
+rbx.platform.typedef.__int_least32_t = int
+rbx.platform.typedef.__int_least64_t = long_long
+rbx.platform.typedef.__int_least8_t = char
+rbx.platform.typedef.__intmax_t = long_long
+rbx.platform.typedef.__intptr_t = long
 rbx.platform.typedef.__key_t = long
 rbx.platform.typedef.__mode_t = uint
 rbx.platform.typedef.__nlink_t = uint
+rbx.platform.typedef.__off_t = long_long
+rbx.platform.typedef.__paddr_t = ulong
 rbx.platform.typedef.__pid_t = int
+rbx.platform.typedef.__psize_t = ulong
+rbx.platform.typedef.__ptrdiff_t = long
+rbx.platform.typedef.__register_t = long_long
 rbx.platform.typedef.__rlim_t = ulong_long
+rbx.platform.typedef.__rune_t = int
 rbx.platform.typedef.__sa_family_t = uchar
 rbx.platform.typedef.__segsz_t = int
+rbx.platform.typedef.__size_t = ulong
 rbx.platform.typedef.__socklen_t = uint
+rbx.platform.typedef.__ssize_t = long
+rbx.platform.typedef.__suseconds_t = int
 rbx.platform.typedef.__swblk_t = int
+rbx.platform.typedef.__time_t = int
+rbx.platform.typedef.__timer_t = int
 rbx.platform.typedef.__uid_t = uint
+rbx.platform.typedef.__uint16_t = ushort
+rbx.platform.typedef.__uint32_t = uint
+rbx.platform.typedef.__uint64_t = ulong_long
+rbx.platform.typedef.__uint8_t = uchar
+rbx.platform.typedef.__uint_fast16_t = uint
+rbx.platform.typedef.__uint_fast32_t = uint
+rbx.platform.typedef.__uint_fast64_t = ulong_long
+rbx.platform.typedef.__uint_fast8_t = uint
+rbx.platform.typedef.__uint_least16_t = ushort
+rbx.platform.typedef.__uint_least32_t = uint
+rbx.platform.typedef.__uint_least64_t = ulong_long
+rbx.platform.typedef.__uint_least8_t = uchar
+rbx.platform.typedef.__uintmax_t = ulong_long
+rbx.platform.typedef.__uintptr_t = ulong
 rbx.platform.typedef.__useconds_t = uint
-rbx.platform.typedef.__suseconds_t = int
-rbx.platform.typedef.u_char = uchar
-rbx.platform.typedef.u_short = ushort
-rbx.platform.typedef.u_int = uint
-rbx.platform.typedef.u_long = ulong
-rbx.platform.typedef.unchar = uchar
-rbx.platform.typedef.ushort = ushort
-rbx.platform.typedef.uint = uint
-rbx.platform.typedef.ulong = ulong
-rbx.platform.typedef.cpuid_t = ulong
-rbx.platform.typedef.register_t = long_long
-rbx.platform.typedef.int8_t = char
-rbx.platform.typedef.uint8_t = uchar
-rbx.platform.typedef.int16_t = short
-rbx.platform.typedef.uint16_t = ushort
-rbx.platform.typedef.int32_t = int
-rbx.platform.typedef.uint32_t = uint
-rbx.platform.typedef.int64_t = long_long
-rbx.platform.typedef.uint64_t = ulong_long
-rbx.platform.typedef.intptr_t = long
-rbx.platform.typedef.uintptr_t = ulong
-rbx.platform.typedef.u_int8_t = uchar
-rbx.platform.typedef.u_int16_t = ushort
-rbx.platform.typedef.u_int32_t = uint
-rbx.platform.typedef.u_int64_t = ulong_long
-rbx.platform.typedef.quad_t = long_long
-rbx.platform.typedef.u_quad_t = ulong_long
-rbx.platform.typedef.qaddr_t = pointer
-rbx.platform.typedef.vaddr_t = ulong
-rbx.platform.typedef.paddr_t = ulong
-rbx.platform.typedef.vsize_t = ulong
-rbx.platform.typedef.psize_t = ulong
+rbx.platform.typedef.__vaddr_t = ulong
+rbx.platform.typedef.__vsize_t = ulong
+rbx.platform.typedef.__wchar_t = int
+rbx.platform.typedef.__wctrans_t = pointer
+rbx.platform.typedef.__wctype_t = pointer
+rbx.platform.typedef.__wint_t = int
 rbx.platform.typedef.caddr_t = string
-rbx.platform.typedef.daddr_t = int
+rbx.platform.typedef.clock_t = int
+rbx.platform.typedef.clockid_t = int
+rbx.platform.typedef.cpuid_t = ulong
 rbx.platform.typedef.daddr32_t = int
 rbx.platform.typedef.daddr64_t = long_long
+rbx.platform.typedef.daddr_t = int
 rbx.platform.typedef.dev_t = int
 rbx.platform.typedef.fixpt_t = uint
 rbx.platform.typedef.gid_t = uint
 rbx.platform.typedef.id_t = uint
+rbx.platform.typedef.in_addr_t = uint
+rbx.platform.typedef.in_port_t = ushort
 rbx.platform.typedef.ino_t = uint
+rbx.platform.typedef.int16_t = short
+rbx.platform.typedef.int32_t = int
+rbx.platform.typedef.int64_t = long_long
+rbx.platform.typedef.int8_t = char
+rbx.platform.typedef.intptr_t = long
 rbx.platform.typedef.key_t = long
 rbx.platform.typedef.mode_t = uint
 rbx.platform.typedef.nlink_t = uint
+rbx.platform.typedef.off_t = long_long
+rbx.platform.typedef.paddr_t = ulong
 rbx.platform.typedef.pid_t = int
+rbx.platform.typedef.psize_t = ulong
+rbx.platform.typedef.qaddr_t = pointer
+rbx.platform.typedef.quad_t = long_long
+rbx.platform.typedef.register_t = long_long
 rbx.platform.typedef.rlim_t = ulong_long
-rbx.platform.typedef.segsz_t = int
-rbx.platform.typedef.swblk_t = int
-rbx.platform.typedef.uid_t = uint
-rbx.platform.typedef.useconds_t = uint
-rbx.platform.typedef.suseconds_t = int
-rbx.platform.typedef.in_addr_t = uint
-rbx.platform.typedef.in_port_t = ushort
 rbx.platform.typedef.sa_family_t = uchar
-rbx.platform.typedef.socklen_t = uint
-rbx.platform.typedef.clock_t = int
-rbx.platform.typedef.clockid_t = int
+rbx.platform.typedef.segsz_t = int
 rbx.platform.typedef.size_t = ulong
+rbx.platform.typedef.socklen_t = uint
 rbx.platform.typedef.ssize_t = long
+rbx.platform.typedef.suseconds_t = int
+rbx.platform.typedef.swblk_t = int
 rbx.platform.typedef.time_t = int
 rbx.platform.typedef.timer_t = int
-rbx.platform.typedef.off_t = long_long
-rbx.platform.typedef.__fd_mask = int
+rbx.platform.typedef.u_char = uchar
+rbx.platform.typedef.u_int = uint
+rbx.platform.typedef.u_int16_t = ushort
+rbx.platform.typedef.u_int32_t = uint
+rbx.platform.typedef.u_int64_t = ulong_long
+rbx.platform.typedef.u_int8_t = uchar
+rbx.platform.typedef.u_long = ulong
+rbx.platform.typedef.u_quad_t = ulong_long
+rbx.platform.typedef.u_short = ushort
+rbx.platform.typedef.uid_t = uint
+rbx.platform.typedef.uint = uint
+rbx.platform.typedef.uint16_t = ushort
+rbx.platform.typedef.uint32_t = uint
+rbx.platform.typedef.uint64_t = ulong_long
+rbx.platform.typedef.uint8_t = uchar
+rbx.platform.typedef.uintptr_t = ulong
+rbx.platform.typedef.ulong = ulong
+rbx.platform.typedef.unchar = uchar
+rbx.platform.typedef.useconds_t = uint
+rbx.platform.typedef.ushort = ushort
+rbx.platform.typedef.vaddr_t = ulong
+rbx.platform.typedef.vsize_t = ulong