ffi 1.16.2 → 1.16.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 219fb8a79026817360b4dc5b79840d000a9272beed3df581e7bac83c6fff5f4e
-  data.tar.gz: 128fb48ada0bfc52d6806e0a5520b4d07127121d6c9353403fdf8f29606f7578
+  metadata.gz: 5920bab18c2bfca946febdf9d31aae894569dd1a293d816631a077696f7db8fa
+  data.tar.gz: 7aa17dd90399d15bd149573ab4b9857907028beae4f84409f76f50e9508aaba2
 SHA512:
-  metadata.gz: d6f1168f0979ad74551670c5db3b5ee3a0887c1e4154aa2998150d19fa2b6084c798735e3ba4a378123d6f3ae33f126d44c83220863b896fb433ee01b28e9b7a
-  data.tar.gz: e0bb7f8c3d0a1f9fc1385bd74ba162f4b54c2e038484d1f61d3a9fe5ddc48c90b747fedd714fca58f6f41ed8e35a60003602aaf54029ae057be3e4c3b14edbe9
+  metadata.gz: dd42730736988cac47f45485f4a8b200c26759066fe156a89ef7736cd6ac80f404e8aaced28a8f10f9b22b43436ed3e248cb191f1c457ccabc19299b91b49174
+  data.tar.gz: '0252969e7a324d530c1d704e2d408f1bd7283f320de90b4c98f20bb49f9d32733ac45609d78a40f821cd5335e102e80576fd446cd5de863babea041d0eb3c780'

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+1.16.3 / 2023-10-04
+-------------------
+
+Fixed:
+* Fix gcc error when building on CentOS 7. #1052
+* Avoid trying to store new DataConverter type in frozen TypeDefs hash. #1057
+
+
 1.16.2 / 2023-09-25
 -------------------
 

data/README.md

@@ -15,7 +15,7 @@ using Ruby-FFI](https://github.com/ffi/ffi/wiki/why-use-ffi).
 * C structs (also nested), enums and global variables
 * Callbacks from C to Ruby
 * Automatic garbage collection of native memory
-* Usable in Ractor
+* Usable in Ractor: [How-to-use-FFI-in-Ruby-Ractors](https://github.com/ffi/ffi/wiki/Ractors)
 
 ## Synopsis
 

data/ext/ffi_c/AbstractMemory.c

@@ -350,6 +350,7 @@ memory_get(VALUE self, VALUE type_name, VALUE offset)
     AbstractMemory* ptr;
     VALUE nType;
     Type *type;
+    MemoryOp *op;
 
     nType = rbffi_Type_Lookup(type_name);
     if(NIL_P(nType)) goto undefined_type;
@@ -357,7 +358,7 @@ memory_get(VALUE self, VALUE type_name, VALUE offset)
     TypedData_Get_Struct(self, AbstractMemory, &rbffi_abstract_memory_data_type, ptr);
     TypedData_Get_Struct(nType, Type, &rbffi_type_data_type, type);
 
-    MemoryOp *op = get_memory_op(type);
+    op = get_memory_op(type);
     if(op == NULL) goto undefined_type;
 
     return op->get(ptr, NUM2LONG(offset));
@@ -382,6 +383,7 @@ memory_put(VALUE self, VALUE type_name, VALUE offset, VALUE value)
     AbstractMemory* ptr;
     VALUE nType;
     Type *type;
+    MemoryOp *op;
 
     nType = rbffi_Type_Lookup(type_name);
     if(NIL_P(nType)) goto undefined_type;
@@ -389,7 +391,7 @@ memory_put(VALUE self, VALUE type_name, VALUE offset, VALUE value)
     TypedData_Get_Struct(self, AbstractMemory, &rbffi_abstract_memory_data_type, ptr);
     TypedData_Get_Struct(nType, Type, &rbffi_type_data_type, type);
 
-    MemoryOp *op = get_memory_op(type);
+    op = get_memory_op(type);
     if(op == NULL) goto undefined_type;
 
     op->put(ptr, NUM2LONG(offset), value);

data/ext/ffi_c/Call.c

@@ -427,8 +427,10 @@ getPointer(VALUE value, int type)
     } else if (type == T_DATA && rb_obj_is_kind_of(value, rbffi_StructClass)) {
 
         Struct* s;
+        AbstractMemory* memory;
+
         TypedData_Get_Struct(value, Struct, &rbffi_struct_data_type, s);
-        AbstractMemory* memory = s->pointer;
+        memory = s->pointer;
         return memory != NULL ? memory->address : NULL;
 
     } else if (type == T_STRING) {
@@ -464,7 +466,9 @@ rbffi_GetInvoker(FunctionType *fnInfo)
 static void*
 callback_param(VALUE proc, VALUE cbInfo)
 {
-    VALUE callback ;
+    VALUE callback;
+    AbstractMemory *mem;
+
     if (unlikely(proc == Qnil)) {
         return NULL ;
     }
@@ -479,7 +483,6 @@ callback_param(VALUE proc, VALUE cbInfo)
     callback = rbffi_Function_ForProc(cbInfo, proc);
     RB_GC_GUARD(callback);
 
-    AbstractMemory *mem;
     TypedData_Get_Struct(callback, AbstractMemory, &rbffi_abstract_memory_data_type, mem);
     return mem->address;
 }

data/ext/ffi_c/Function.c

@@ -953,10 +953,10 @@ invoke_callback(VALUE data)
 
             } else if (rb_obj_is_kind_of(rbReturnValue, rb_cProc) || rb_respond_to(rbReturnValue, id_call)) {
                 VALUE function;
+                AbstractMemory* memory;
 
                 function = rbffi_Function_ForProc(rbReturnType, rbReturnValue);
 
-                AbstractMemory* memory;
                 TypedData_Get_Struct(function, AbstractMemory, &rbffi_abstract_memory_data_type, memory);
 
                 *((void **) retval) = memory->address;
@@ -968,8 +968,10 @@ invoke_callback(VALUE data)
         case NATIVE_STRUCT:
             if (TYPE(rbReturnValue) == T_DATA && rb_obj_is_kind_of(rbReturnValue, rbffi_StructClass)) {
                 Struct* s;
+                AbstractMemory* memory;
+
                 TypedData_Get_Struct(rbReturnValue, Struct, &rbffi_struct_data_type, s);
-                AbstractMemory* memory = s->pointer;
+                memory = s->pointer;
 
                 if (memory->address != NULL) {
                     memcpy(retval, memory->address, returnType->ffiType->size);

data/ext/ffi_c/FunctionInfo.c

@@ -97,7 +97,8 @@ fntype_mark(void *data)
     rb_gc_mark_movable(fnInfo->rbParameterTypes);
     rb_gc_mark_movable(fnInfo->rbEnums);
     if (fnInfo->callbackCount > 0 && fnInfo->callbackParameters != NULL) {
-        for (size_t index = 0; index < fnInfo->callbackCount; index++) {
+        size_t index;
+        for (index = 0; index < fnInfo->callbackCount; index++) {
             rb_gc_mark_movable(fnInfo->callbackParameters[index]);
         }
     }
@@ -111,7 +112,8 @@ fntype_compact(void *data)
     ffi_gc_location(fnInfo->rbParameterTypes);
     ffi_gc_location(fnInfo->rbEnums);
     if (fnInfo->callbackCount > 0 && fnInfo->callbackParameters != NULL) {
-        for (size_t index = 0; index < fnInfo->callbackCount; index++) {
+        size_t index;
+        for (index = 0; index < fnInfo->callbackCount; index++) {
             ffi_gc_location(fnInfo->callbackParameters[index]);
         }
     }

data/ext/ffi_c/Struct.c

@@ -189,9 +189,11 @@ struct_initialize_copy(VALUE self, VALUE other)
     }
 
     if (src->layout->referenceFieldCount > 0) {
+        size_t index;
+
         dst->rbReferences = ALLOC_N(VALUE, dst->layout->referenceFieldCount);
         memcpy(dst->rbReferences, src->rbReferences, dst->layout->referenceFieldCount * sizeof(VALUE));
-        for (size_t index = 0; index < dst->layout->referenceFieldCount; index++) {
+        for ( index = 0; index < dst->layout->referenceFieldCount; index++) {
             RB_OBJ_WRITTEN(self, Qundef, &dst->rbReferences[index]);
         }
     }
@@ -268,7 +270,8 @@ struct_mark(void *data)
     rb_gc_mark_movable(s->rbPointer);
     rb_gc_mark_movable(s->rbLayout);
     if (s->rbReferences != NULL) {
-        for (size_t index = 0; index < s->layout->referenceFieldCount; index++) {
+        size_t index;
+        for (index = 0; index < s->layout->referenceFieldCount; index++) {
             rb_gc_mark_movable(s->rbReferences[index]);
         }
     }
@@ -281,7 +284,8 @@ struct_compact(void *data)
     ffi_gc_location(s->rbPointer);
     ffi_gc_location(s->rbLayout);
     if (s->rbReferences != NULL) {
-        for (size_t index = 0; index < s->layout->referenceFieldCount; index++) {
+        size_t index;
+        for (index = 0; index < s->layout->referenceFieldCount; index++) {
             ffi_gc_location(s->rbReferences[index]);
         }
     }

data/ext/ffi_c/libffi/compile

@@ -1,9 +1,9 @@
 #! /bin/sh
 # Wrapper for compilers which do not understand '-c -o'.
 
-scriptversion=2012-10-14.11; # UTC
+scriptversion=2018-03-07.03; # UTC
 
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2021 Free Software Foundation, Inc.
 # Written by Tom Tromey <tromey@cygnus.com>.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -17,7 +17,7 @@ scriptversion=2012-10-14.11; # UTC
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+# along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -53,7 +53,7 @@ func_file_conv ()
 	  MINGW*)
 	    file_conv=mingw
 	    ;;
-	  CYGWIN*)
+	  CYGWIN* | MSYS*)
 	    file_conv=cygwin
 	    ;;
 	  *)
@@ -67,7 +67,7 @@ func_file_conv ()
 	mingw/*)
 	  file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
 	  ;;
-	cygwin/*)
+	cygwin/* | msys/*)
 	  file=`cygpath -m "$file" || echo "$file"`
 	  ;;
 	wine/*)
@@ -255,7 +255,8 @@ EOF
     echo "compile $scriptversion"
     exit $?
     ;;
-  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
+  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \
+  icl | *[/\\]icl | icl.exe | *[/\\]icl.exe )
     func_cl_wrapper "$@"      # Doesn't return...
     ;;
 esac
@@ -339,9 +340,9 @@ exit $ret
 # Local Variables:
 # mode: shell-script
 # sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
 # time-stamp-start: "scriptversion="
 # time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
 # time-stamp-end: "; # UTC"
 # End:

data/lib/ffi/types.rb

@@ -87,7 +87,8 @@ module FFI
       TypeDefs[name]
 
     elsif name.is_a?(DataConverter)
-      (type_map || TypeDefs)[name] = Type::Mapped.new(name)
+      tm = (type_map || custom_typedefs)
+      tm[name] = Type::Mapped.new(name)
     else
       raise TypeError, "unable to resolve type '#{name}'"
     end

data/lib/ffi/version.rb

@@ -1,3 +1,3 @@
 module FFI
-  VERSION = '1.16.2'
+  VERSION = '1.16.3'
 end

data/samples/hello_ractor.rb

@@ -0,0 +1,11 @@
+require 'ffi'
+
+module Foo
+  extend FFI::Library
+  ffi_lib FFI::Library::LIBC
+  attach_function("cputs", "puts", [ :string ], :int)
+  freeze
+end
+Ractor.new do
+  Foo.cputs("Hello, World via libc puts using FFI in a Ractor")
+end.take

data/samples/qsort_ractor.rb

@@ -0,0 +1,28 @@
+require 'ffi'
+
+module LibC
+  extend FFI::Library
+  ffi_lib FFI::Library::LIBC
+  callback :qsort_cmp, [ :pointer, :pointer ], :int
+  attach_function :qsort, [ :pointer, :ulong, :ulong, :qsort_cmp ], :int
+
+  freeze # Freeze the module variables, so that it can be shared across ractors.
+end
+
+p = FFI::MemoryPointer.new(:int, 3)
+p.put_array_of_int32(0, [ 2, 3, 1 ])   # Write some unsorted data into the memory
+# Ractor.make_shareable(p)             # freeze the pointer to be shared between ractors instead of copied
+puts "main  -ptr=#{p.inspect}"
+res = Ractor.new(p) do |p|
+  puts "ractor-ptr=#{p.inspect}"
+  puts "Before qsort #{p.get_array_of_int32(0, 3).join(', ')}"
+  LibC.qsort(p, 3, 4) do |p1, p2|
+    i1 = p1.get_int32(0)
+    i2 = p2.get_int32(0)
+    puts "In block: comparing #{i1} and #{i2}"
+    i1 < i2 ? -1 : i1 > i2 ? 1 : 0
+  end
+  puts "After qsort #{p.get_array_of_int32(0, 3).join(', ')}"
+end.take
+
+puts "After ractor termination #{p.get_array_of_int32(0, 3).join(', ')}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ffi
 version: !ruby/object:Gem::Version
-  version: 1.16.2
+  version: 1.16.3
 platform: ruby
 authors:
 - Wayne Meissner
@@ -33,7 +33,7 @@ cert_chain:
   Dzx/gFSOrRoCt2mXNgrmcAfr386AfaMvCh7cXqdxZwmVo7ILZCYXck0pajvubsDd
   NUIIFkVXvd1odFyK9LF1RFAtxn/iAmpx
   -----END CERTIFICATE-----
-date: 2023-09-25 00:00:00.000000000 Z
+date: 2023-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -712,9 +712,11 @@ files:
 - samples/getpid.rb
 - samples/gettimeofday.rb
 - samples/hello.rb
+- samples/hello_ractor.rb
 - samples/inotify.rb
 - samples/pty.rb
 - samples/qsort.rb
+- samples/qsort_ractor.rb
 homepage: https://github.com/ffi/ffi/wiki
 licenses:
 - BSD-3-Clause