ffi 0.6.3-x86-mingw32 → 1.0.1-x86-mingw32

data/History.txt

@@ -1,3 +1,10 @@
+== 1.0.0 / 2010-11-30
+* Major improvements
+  * Better handling of non-ruby thread callbacks
+  * Support for releasing the GIL during C function calls
+* Minor improvements
+  * code cleanups
+
 == 0.5.0 / 2009-10-06
 
 * Major improvements

data/LICENSE

@@ -1,25 +1,14 @@
-Copyright (c) 2008, 2009 Ruby FFI contributors
+Copyright (c) 2008-2010 Ruby-FFI 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:
+This code is free software: you can redistribute it and/or modify it under
+the terms of the GNU Lesser General Public License version 3 only, as
+published by the Free Software Foundation.
 
-* 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 JRuby 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 code is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
+version 3 for more details.
 
-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.
+You should have received a copy of the GNU Lesser General Public License
+version 3 along with this work.  If not, see <http://www.gnu.org/licenses/>.

data/README.rdoc

@@ -24,6 +24,7 @@ using Ruby-FFI here[http://wiki.github.com/ffi/ffi/why-use-ffi].
 
   module MyLib
     extend FFI::Library
+    ffi_lib 'c'
     attach_function :puts, [ :string ], :int
   end
 

data/Rakefile

@@ -5,7 +5,7 @@ USE_RAKE_COMPILER = (RUBY_PLATFORM =~ /java/) ? false : true
 if USE_RAKE_COMPILER
   gem 'rake-compiler', '>=0.6.0'
   require 'rake/extensiontask'
-  ENV['RUBY_CC_VERSION'] = '1.8.6:1.9.1'
+  ENV['RUBY_CC_VERSION'] = '1.9.2'
 end
 
 require 'date'
@@ -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 = '0.6.3'
+PROJ.version = '1.0.1'
 PROJ.rubyforge.name = 'ffi'
 PROJ.readme_file = 'README.rdoc'
 
@@ -90,9 +90,11 @@ PROJ.ann.email[:server] = 'smtp.gmail.com'
 PROJ.gem.need_tar = false
 PROJ.gem.files = %w(History.txt LICENSE README.rdoc Rakefile) + Dir.glob("{ext,gen,lib,spec,tasks}/**/*")
 PROJ.gem.platform = Gem::Platform::RUBY
+PROJ.gem.required_ruby_version = ">= 1.9.2"
 
 # Override Mr. Bones autogenerated extensions and force ours in
 PROJ.gem.extras['extensions'] = %w(ext/ffi_c/extconf.rb gen/Rakefile)
+PROJ.gem.extras['required_ruby_version'] = ">= 1.9.2"
 
 # RDoc
 PROJ.rdoc.exclude << '^ext\/'

data/ext/ffi_c/AbstractMemory.c

@@ -3,33 +3,26 @@
  *
  * All rights reserved.
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
+ * This file is part of ruby-ffi.
  *
- * * 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.
- * * The name of the author or authors may not be used to endorse or promote
- *   products derived from this software without specific prior written permission.
+ * This code is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License version 3 only, as
+ * published by the Free Software Foundation.
  *
- * 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.
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
+ * version 3 for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with this work.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <sys/types.h>
 #include <sys/param.h>
 #include <stdint.h>
 #include <stdbool.h>
+#include <limits.h>
 #include <ruby.h>
 #include "rbffi.h"
 #include "compat.h"
@@ -49,17 +42,18 @@ memory_allocate(VALUE klass)
     AbstractMemory* memory;
     VALUE obj;
     obj = Data_Make_Struct(klass, AbstractMemory, NULL, -1, memory);
-    memory->access = MEM_RD | MEM_WR;
+    memory->flags = MEM_RD | MEM_WR;
 
     return obj;
 }
+#define VAL(x, swap) (unlikely(((memory->flags & MEM_SWAP) != 0)) ? swap((x)) : (x))
 
-#define NUM_OP(name, type, toNative, fromNative) \
+#define NUM_OP(name, type, toNative, fromNative, swap) \
 static void memory_op_put_##name(AbstractMemory* memory, long off, VALUE value); \
 static void \
 memory_op_put_##name(AbstractMemory* memory, long off, VALUE value) \
 { \
-    type tmp = (type) toNative(value); \
+    type tmp = (type) VAL(toNative(value), swap); \
     checkWrite(memory); \
     checkBounds(memory, off, sizeof(type)); \
     memcpy(memory->address + off, &tmp, sizeof(tmp)); \
@@ -81,7 +75,7 @@ memory_op_get_##name(AbstractMemory* memory, long off) \
     checkRead(memory); \
     checkBounds(memory, off, sizeof(type)); \
     memcpy(&tmp, memory->address + off, sizeof(tmp)); \
-    return fromNative(tmp); \
+    return fromNative(VAL(tmp, swap)); \
 } \
 static VALUE memory_get_##name(VALUE self, VALUE offset); \
 static VALUE \
@@ -104,7 +98,7 @@ memory_put_array_of_##name(VALUE self, VALUE offset, VALUE ary) \
     checkWrite(memory); \
     checkBounds(memory, off, count * sizeof(type)); \
     for (i = 0; i < count; i++) { \
-        type tmp = (type) toNative(RARRAY_PTR(ary)[i]); \
+        type tmp = (type) VAL(toNative(RARRAY_PTR(ary)[i]), swap); \
         memcpy(memory->address + off + (i * sizeof(type)), &tmp, sizeof(tmp)); \
     } \
     return self; \
@@ -123,23 +117,94 @@ memory_get_array_of_##name(VALUE self, VALUE offset, VALUE length) \
     for (i = 0; i < count; ++i) { \
         type tmp; \
         memcpy(&tmp, memory->address + off + (i * sizeof(type)), sizeof(tmp)); \
-        rb_ary_push(retVal, fromNative(tmp)); \
+        rb_ary_push(retVal, fromNative(VAL(tmp, swap))); \
     } \
     return retVal; \
 }
 
-NUM_OP(int8, int8_t, NUM2INT, INT2NUM);
-NUM_OP(uint8, uint8_t, NUM2UINT, UINT2NUM);
-NUM_OP(int16, int16_t, NUM2INT, INT2NUM);
-NUM_OP(uint16, uint16_t, NUM2UINT, UINT2NUM);
-NUM_OP(int32, int32_t, NUM2INT, INT2NUM);
-NUM_OP(uint32, uint32_t, NUM2UINT, UINT2NUM);
-NUM_OP(int64, int64_t, NUM2LL, LL2NUM);
-NUM_OP(uint64, uint64_t, NUM2ULL, ULL2NUM);
-NUM_OP(long, long, NUM2LONG, LONG2NUM);
-NUM_OP(ulong, unsigned long, NUM2ULONG, ULONG2NUM);
-NUM_OP(float32, float, NUM2DBL, rb_float_new);
-NUM_OP(float64, double, NUM2DBL, rb_float_new);
+#define NOSWAP(x) (x)
+#define bswap16(x) (((x) >> 8) & 0xff) | (((x) << 8) & 0xff00);
+static inline int16_t
+SWAPS16(int16_t x)
+{
+    return bswap16(x);
+}
+
+static inline uint16_t
+SWAPU16(uint16_t x)
+{
+    return bswap16(x);
+}
+
+#define SWAP16(x) (x)
+#if __GNUC__ < 4
+#define bswap32(x) \
+       (((x << 24) & 0xff000000) | \
+        ((x <<  8) & 0x00ff0000) | \
+        ((x >>  8) & 0x0000ff00) | \
+        ((x >> 24) & 0x000000ff))
+
+#define bswap64(x) \
+       (((x << 56) & 0xff00000000000000ULL) | \
+        ((x << 40) & 0x00ff000000000000ULL) | \
+        ((x << 24) & 0x0000ff0000000000ULL) | \
+        ((x <<  8) & 0x000000ff00000000ULL) | \
+        ((x >>  8) & 0x00000000ff000000ULL) | \
+        ((x >> 24) & 0x0000000000ff0000ULL) | \
+        ((x >> 40) & 0x000000000000ff00ULL) | \
+        ((x >> 56) & 0x00000000000000ffULL))
+
+static inline int32_t 
+SWAPS32(int32_t x)
+{
+    return bswap32(x);
+}
+
+static inline uint32_t 
+SWAPU32(uint32_t x)
+{
+    return bswap32(x);
+}
+
+static inline int64_t
+SWAPS64(int64_t x)
+{
+    return bswap64(x);
+}
+
+static inline uint64_t
+SWAPU64(uint64_t x)
+{
+    return bswap64(x);
+}
+
+#else
+# define SWAPU32(x) __builtin_bswap32(x)
+# define SWAPS32(x) __builtin_bswap32(x)
+# define SWAPS64(x) __builtin_bswap64(x)
+# define SWAPU64(x) __builtin_bswap64(x)
+#endif
+
+#if LONG_MAX > INT_MAX
+# define SWAPSLONG SWAPS64
+# define SWAPULONG SWAPU64
+#else
+# define SWAPSLONG SWAPS32
+# define SWAPULONG SWAPU32
+#endif
+
+NUM_OP(int8, int8_t, NUM2INT, INT2NUM, NOSWAP);
+NUM_OP(uint8, uint8_t, NUM2UINT, UINT2NUM, NOSWAP);
+NUM_OP(int16, int16_t, NUM2INT, INT2NUM, SWAPS16);
+NUM_OP(uint16, uint16_t, NUM2UINT, UINT2NUM, SWAPU16);
+NUM_OP(int32, int32_t, NUM2INT, INT2NUM, SWAPS32);
+NUM_OP(uint32, uint32_t, NUM2UINT, UINT2NUM, SWAPU32);
+NUM_OP(int64, int64_t, NUM2LL, LL2NUM, SWAPS64);
+NUM_OP(uint64, uint64_t, NUM2ULL, ULL2NUM, SWAPU64);
+NUM_OP(long, long, NUM2LONG, LONG2NUM, SWAPSLONG);
+NUM_OP(ulong, unsigned long, NUM2ULONG, ULONG2NUM, SWAPULONG);
+NUM_OP(float32, float, NUM2DBL, rb_float_new, NOSWAP);
+NUM_OP(float64, double, NUM2DBL, rb_float_new, NOSWAP);
 
 static inline void*
 get_pointer_value(VALUE value)
@@ -161,7 +226,7 @@ get_pointer_value(VALUE value)
     }
 }
 
-NUM_OP(pointer, void *, get_pointer_value, rbffi_Pointer_NewInstance);
+NUM_OP(pointer, void *, get_pointer_value, rbffi_Pointer_NewInstance, NOSWAP);
 
 static VALUE
 memory_clear(VALUE self)

data/ext/ffi_c/AbstractMemory.h

@@ -3,27 +3,19 @@
  *
  * All rights reserved.
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
+ * This file is part of ruby-ffi.
  *
- * * 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.
- * * The name of the author or authors may not be used to endorse or promote
- *   products derived from this software without specific prior written permission.
+ * This code is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License version 3 only, as
+ * published by the Free Software Foundation.
  *
- * 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.
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
+ * version 3 for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with this work.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef RBFFI_ABSTRACTMEMORY_H
@@ -44,6 +36,7 @@ extern "C" {
 #define MEM_RD   0x01
 #define MEM_WR   0x02
 #define MEM_CODE 0x04
+#define MEM_SWAP 0x08
 
 typedef struct AbstractMemory_ AbstractMemory;
 
@@ -72,7 +65,7 @@ typedef struct {
 struct AbstractMemory_ {
     char* address; // Use char* instead of void* to ensure adding to it works correctly
     long size;
-    int access;
+    int flags;
     int typeSize;
 };
 
@@ -98,7 +91,7 @@ checkBounds(AbstractMemory* mem, long off, long len)
 static inline void
 checkRead(AbstractMemory* mem)
 {
-    if (unlikely((mem->access & MEM_RD) == 0)) {
+    if (unlikely((mem->flags & MEM_RD) == 0)) {
         rbffi_AbstractMemory_Error(mem, MEM_RD);
     }
 }
@@ -106,7 +99,7 @@ checkRead(AbstractMemory* mem)
 static inline void
 checkWrite(AbstractMemory* mem)
 {
-    if (unlikely((mem->access & MEM_WR) == 0)) {
+    if (unlikely((mem->flags & MEM_WR) == 0)) {
         rbffi_AbstractMemory_Error(mem, MEM_WR);
     }
 }

data/ext/ffi_c/Buffer.c

@@ -1,28 +1,21 @@
 /*
- * Copyright (c) 2008, 2009, Wayne Meissner
+ * Copyright (c) 2008-2010 Wayne Meissner
+ * 
  * All rights reserved.
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
+ * This file is part of ruby-ffi.
  *
- * * 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.
- * * The name of the author or authors may not be used to endorse or promote
- *   products derived from this software without specific prior written permission.
+ * This code is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License version 3 only, as
+ * published by the Free Software Foundation.
  *
- * 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.
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
+ * version 3 for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with this work.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <stdbool.h>
@@ -54,7 +47,7 @@ buffer_allocate(VALUE klass)
 
     obj = Data_Make_Struct(klass, Buffer, NULL, buffer_release, buffer);
     buffer->rbParent = Qnil;
-    buffer->memory.access = MEM_RD | MEM_WR;
+    buffer->memory.flags = MEM_RD | MEM_WR;
 
     return obj;
 }
@@ -122,7 +115,7 @@ slice(VALUE self, long offset, long len)
     obj = Data_Make_Struct(BufferClass, Buffer, buffer_mark, -1, result);
     result->memory.address = ptr->memory.address + offset;
     result->memory.size = len;
-    result->memory.access = ptr->memory.access;
+    result->memory.flags = ptr->memory.flags;
     result->memory.typeSize = ptr->memory.typeSize;
     result->rbParent = self;
 
@@ -159,6 +152,51 @@ buffer_inspect(VALUE self)
     return rb_str_new2(tmp);
 }
 
+
+#if BYTE_ORDER == LITTLE_ENDIAN
+# define SWAPPED_ORDER BIG_ENDIAN
+#else
+# define SWAPPED_ORDER LITTLE_ENDIAN
+#endif
+
+static VALUE
+buffer_order(int argc, VALUE* argv, VALUE self)
+{
+    Buffer* ptr;
+
+    Data_Get_Struct(self, Buffer, ptr);
+    if (argc == 0) {
+        int order = (ptr->memory.flags & MEM_SWAP) == 0 ? BYTE_ORDER : SWAPPED_ORDER;
+        return order == BIG_ENDIAN ? ID2SYM(rb_intern("big")) : ID2SYM(rb_intern("little"));
+    } else {
+        VALUE rbOrder = Qnil;
+        int order = BYTE_ORDER;
+
+        if (rb_scan_args(argc, argv, "1", &rbOrder) < 1) {
+            rb_raise(rb_eArgError, "need byte order");
+        }
+        if (SYMBOL_P(rbOrder)) {
+            ID id = SYM2ID(rbOrder);
+            if (id == rb_intern("little")) {
+                order = LITTLE_ENDIAN;
+
+            } else if (id == rb_intern("big") || id == rb_intern("network")) {
+                order = BIG_ENDIAN;
+            }
+        }
+        if (order != BYTE_ORDER) {
+            Buffer* p2;
+            VALUE retval = slice(self, 0, ptr->memory.size);
+
+            Data_Get_Struct(retval, Buffer, p2);
+            p2->memory.flags |= MEM_SWAP;
+            return retval;
+        }
+
+        return self;
+    }
+}
+
 /* Only used to free the buffer if the yield in the initializer throws an exception */
 static VALUE
 buffer_free(VALUE self)
@@ -196,6 +234,7 @@ rbffi_Buffer_Init(VALUE moduleFFI)
     rb_define_alias(rb_singleton_class(BufferClass), "new_inout", "alloc_inout");
     
     rb_define_method(BufferClass, "initialize", buffer_initialize, -1);
+    rb_define_method(BufferClass, "order", buffer_order, -1);
     rb_define_method(BufferClass, "inspect", buffer_inspect, 0);
     rb_define_alias(BufferClass, "length", "total");
     rb_define_method(BufferClass, "+", buffer_plus, 1);