ffi 1.0.5 → 1.0.6

data/Rakefile

@@ -75,7 +75,7 @@ PROJ.name = 'ffi'
 PROJ.authors = 'Wayne Meissner'
 PROJ.email = 'wmeissner@gmail.com'
 PROJ.url = 'http://wiki.github.com/ffi/ffi'
-PROJ.version = '1.0.5'
+PROJ.version = '1.0.6'
 PROJ.rubyforge.name = 'ffi'
 PROJ.readme_file = 'README.rdoc'
 

data/ext/ffi_c/Struct.c

@@ -52,9 +52,11 @@ typedef struct InlineArray_ {
 
 
 static void struct_mark(Struct *);
+static void struct_free(Struct *);
 static VALUE struct_class_layout(VALUE klass);
 static void struct_malloc(Struct* s);
 static void inline_array_mark(InlineArray *);
+static void store_reference_value(StructField* f, Struct* s, VALUE value);
 
 VALUE rbffi_StructClass = Qnil;
 
@@ -74,7 +76,7 @@ static VALUE
 struct_allocate(VALUE klass)
 {
     Struct* s;
-    VALUE obj = Data_Make_Struct(klass, Struct, struct_mark, -1, s);
+    VALUE obj = Data_Make_Struct(klass, Struct, struct_mark, struct_free, s);
     
     s->rbPointer = Qnil;
     s->rbLayout = Qnil;
@@ -183,8 +185,37 @@ struct_mark(Struct *s)
 {
     rb_gc_mark(s->rbPointer);
     rb_gc_mark(s->rbLayout);
+    if (s->rbReferences != NULL) {
+        rb_gc_mark_locations(&s->rbReferences[0], &s->rbReferences[s->layout->referenceFieldCount]);
+    }
+}
+
+static void
+struct_free(Struct* s)
+{
+    xfree(s->rbReferences);
 }
 
+
+static void
+store_reference_value(StructField* f, Struct* s, VALUE value)
+{
+    if (unlikely(f->referenceIndex == -1)) {
+        rb_raise(rb_eRuntimeError, "put_reference_value called for non-reference type");
+        return;
+    }
+    if (s->rbReferences == NULL) {
+        int i;
+        s->rbReferences = ALLOC_N(VALUE, s->layout->referenceFieldCount);
+        for (i = 0; i < s->layout->referenceFieldCount; ++i) {
+            s->rbReferences[i] = Qnil;
+        }
+    }
+
+    s->rbReferences[f->referenceIndex] = value;
+}
+
+
 static VALUE
 struct_field(Struct* s, VALUE fieldName)
 {
@@ -255,6 +286,10 @@ struct_aset(VALUE self, VALUE fieldName, VALUE value)
         argv[1] = value;
         rb_funcall2(rbField, id_put, 2, argv);
     }
+
+    if (f->referenceRequired) {
+        store_reference_value(f, s, value);
+    }
     
     return value;
 }

data/ext/ffi_c/Struct.h

@@ -44,6 +44,9 @@ extern "C" {
         Type* type;
         unsigned int offset;
 
+        int referenceIndex;
+
+        bool referenceRequired;
         VALUE rbType;
         VALUE rbName;
 
@@ -61,6 +64,10 @@ extern "C" {
         int align;
         ffi_type** ffiTypes;
         struct st_table* fieldSymbolTable;
+
+        /** The number of reference tracking fields in this struct */
+        int referenceFieldCount;
+        
         VALUE rbFieldNames;
         VALUE rbFieldMap;
         VALUE rbFields;
@@ -69,6 +76,8 @@ extern "C" {
     struct Struct_ {
         StructLayout* layout;
         AbstractMemory* pointer;
+        VALUE* rbReferences;
+
         VALUE rbLayout;
         VALUE rbPointer;
     };

data/ext/ffi_c/StructLayout.c

@@ -36,6 +36,7 @@
 #include "Struct.h"
 #include "StructByValue.h"
 #include "ArrayType.h"
+#include "MappedType.h"
 
 #define FFI_ALIGN(v, a)  (((((size_t) (v))-1) | ((a)-1))+1)
 
@@ -99,7 +100,23 @@ struct_field_initialize(int argc, VALUE* argv, VALUE self)
     field->rbType = rbType;
     Data_Get_Struct(field->rbType, Type, field->type);
     field->memoryOp = get_memory_op(field->type);
-
+    field->referenceIndex = -1;
+
+    switch (field->type->nativeType == NATIVE_MAPPED ? ((MappedType *) field->type)->type->nativeType : field->type->nativeType) {
+        case NATIVE_FUNCTION:
+        case NATIVE_CALLBACK:
+        case NATIVE_POINTER:
+            field->referenceRequired = true;
+            break;
+
+        default:
+            field->referenceRequired = (rb_respond_to(self, rb_intern("reference_required?"))
+                    && RTEST(rb_funcall2(self, rb_intern("reference_required?"), 0, NULL)))
+                    || (rb_respond_to(rbType, rb_intern("reference_required?"))
+                        && RTEST(rb_funcall2(rbType, rb_intern("reference_required?"), 0, NULL)));
+            break;
+    }
+    
     return self;
 }
 
@@ -339,6 +356,7 @@ struct_layout_initialize(VALUE self, VALUE fields, VALUE size, VALUE align)
     layout->fields = xcalloc(layout->fieldCount, sizeof(StructField *));
     layout->ffiTypes = xcalloc(layout->fieldCount + 1, sizeof(ffi_type *));
     layout->rbFields = rb_ary_new2(layout->fieldCount);
+    layout->referenceFieldCount = 0;
     layout->base.ffiType->elements = layout->ffiTypes;
     layout->base.ffiType->size = layout->size;
     layout->base.ffiType->alignment = layout->align;
@@ -367,6 +385,10 @@ struct_layout_initialize(VALUE self, VALUE fields, VALUE size, VALUE align)
             rb_raise(rb_eTypeError, "type of field %d has zero size", i);
         }
 
+        if (field->referenceRequired) {
+            field->referenceIndex = layout->referenceFieldCount++;
+        }
+
         layout->ffiTypes[i] = ftype;
         st_insert(layout->fieldSymbolTable, rbName, rbField);
         rb_hash_aset(layout->rbFieldMap, rbName, rbField);

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ffi
 version: !ruby/object:Gem::Version 
-  version: 1.0.5
+  hash: 27
+  prerelease: false
+  segments: 
+  - 1
+  - 0
+  - 6
+  version: 1.0.6
 platform: ruby
 authors: 
 - Wayne Meissner
@@ -9,19 +15,25 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-13 00:00:00 +10:00
+date: 2011-02-21 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 49
+        segments: 
+        - 0
+        - 8
+        - 7
         version: 0.8.7
-    version: 
+  type: :runtime
+  version_requirements: *id001
 description: |-
   Ruby-FFI is a ruby extension for programmatically loading dynamic
   libraries, binding functions within them, and calling those functions
@@ -422,21 +434,27 @@ require_paths:
 - lib
 - ext
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: ffi
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Ruby-FFI is a ruby extension for programmatically loading dynamic libraries, binding functions within them, and calling those functions from Ruby code