ffi 0.3.2 → 0.3.3

data/Rakefile

@@ -31,7 +31,7 @@ PROJ.name = 'ffi'
 PROJ.authors = 'Wayne Meissner'
 PROJ.email = 'wmeissner@gmail.com'
 PROJ.url = 'http://kenai.com/projects/ruby-ffi'
-PROJ.version = '0.3.2'
+PROJ.version = '0.3.3'
 PROJ.rubyforge.name = 'ffi'
 PROJ.readme_file = 'README.rdoc'
 
@@ -43,7 +43,7 @@ PROJ.ann.email[:server] = 'smtp.gmail.com'
 
 # Gem specifications
 PROJ.gem.need_tar = false
-PROJ.gem.files = %w(LICENSE README.rdoc Rakefile) + Dir.glob("{ext,lib,nbproject,samples,spec}/**/*")
+PROJ.gem.files = %w(LICENSE README.rdoc Rakefile) + Dir.glob("{ext,lib,spec}/**/*")
 PROJ.gem.platform = Gem::Platform::RUBY
 PROJ.gem.extensions = %w(ext/ffi_c/extconf.rb gen/Rakefile)
 

data/ext/ffi_c/Buffer.c

@@ -50,18 +50,17 @@ buffer_initialize(int argc, VALUE* argv, VALUE self)
 {
     VALUE size = Qnil, count = Qnil, clear = Qnil;
     Buffer* p;
-    unsigned long msize;
     int nargs;
-    
-    nargs = rb_scan_args(argc, argv, "12", &size, &count, &clear);
-    msize = rb_FFI_type_size(size) * (nargs > 1 ? NUM2LONG(count) : 1);
 
     Data_Get_Struct(self, Buffer, p);
-    p->memory.size = msize;
 
-    p->storage = malloc(msize + 7);
+    nargs = rb_scan_args(argc, argv, "12", &size, &count, &clear);
+    p->type_size = rb_FFI_type_size(size);
+    p->memory.size = p->type_size * (nargs > 1 ? NUM2LONG(count) : 1);
+
+    p->storage = malloc(p->memory.size + 7);
     if (p->storage == NULL) {
-        rb_raise(rb_eNoMemError, "Failed to allocate memory size=%lu bytes", msize);
+        rb_raise(rb_eNoMemError, "Failed to allocate memory size=%lu bytes", p->memory.size);
     }
 
     /* ensure the memory is aligned on at least a 8 byte boundary */
@@ -103,6 +102,24 @@ buffer_plus(VALUE self, VALUE offset)
     return retval;
 }
 
+static VALUE
+buffer_aref(VALUE self, VALUE offset)
+{
+    Buffer* ptr;
+
+    Data_Get_Struct(self, Buffer, ptr);
+    return buffer_plus(self, INT2FIX(ptr->type_size * NUM2INT(offset)));
+}
+
+static VALUE
+buffer_type_size(VALUE self)
+{
+    Buffer* ptr;
+
+    Data_Get_Struct(self, Buffer, ptr);
+    return INT2NUM(ptr->type_size);
+}
+
 static VALUE
 buffer_inspect(VALUE self)
 {
@@ -149,5 +166,7 @@ rb_FFI_Buffer_Init()
     
     rb_define_method(classBuffer, "initialize", buffer_initialize, -1);
     rb_define_method(classBuffer, "inspect", buffer_inspect, 0);
+    rb_define_method(classBuffer, "type_size", buffer_type_size, 0);
+    rb_define_method(classBuffer, "[]", buffer_aref, 1);
     rb_define_method(classBuffer, "+", buffer_plus, 1);
 }

data/ext/ffi_c/ffi.c

@@ -40,9 +40,9 @@ rb_FFI_type_size(VALUE type)
             }
         }
         // Not found - call up to the ruby version to resolve
-        return rb_funcall(moduleFFI, rb_intern("type_size"), 1, &type);
+        return NUM2INT(rb_funcall2(moduleFFI, rb_intern("type_size"), 1, &type));
     } else {
-        return rb_funcall(type, size_id, 0, NULL);
+        return NUM2INT(rb_funcall2(type, size_id, 0, NULL));
     }
 }
 

data/spec/ffi/struct_spec.rb

@@ -451,3 +451,28 @@ describe 'BuggedStruct' do
     end.should == [[:visible, 0], [:x, 4], [:y, 8], [:rx, 12], [:ry, 14], [:order, 16], [:size, 17]]
   end
 end
+
+describe "Struct allocation" do
+  it "MemoryPointer.new(Struct, 2)" do
+    class S < FFI::Struct
+      layout :i, :uint
+    end
+    p = FFI::MemoryPointer.new(S, 2)
+    p.total.should == 8
+    p.type_size.should == 4
+    p.put_uint(4, 0xdeadbeef)
+    S.new(p[1])[:i].should == 0xdeadbeef
+    p[1].address.should == (p[0].address + 4)
+  end
+
+  it "Buffer.new(Struct, 2)" do
+    class S < FFI::Struct
+      layout :i, :uint
+    end
+    p = FFI::Buffer.new(S, 2)
+    p.total.should == 8
+    p.type_size.should == 4
+    p.put_uint(4, 0xdeadbeef)
+    S.new(p[1])[:i].should == 0xdeadbeef
+  end
+end

metadata

@@ -1,34 +1,37 @@
 --- !ruby/object:Gem::Specification 
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - '>='
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
-email: wmeissner@gmail.com
+name: ffi
+version: !ruby/object:Gem::Version 
+  version: 0.3.3
+platform: ruby
+authors: 
+- Wayne Meissner
+autorequire: 
+bindir: bin
 cert_chain: []
 
-summary: A Ruby foreign function interface
-post_install_message: 
+date: 2009-04-27 00:00:00 +10:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: bones
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 2.4.2
+    version: 
+description: A Ruby foreign function interface
+email: wmeissner@gmail.com
+executables: []
+
+extensions: 
+- ext/ffi_c/extconf.rb
 extra_rdoc_files: 
 - README.rdoc
 - lib/ffi
 - lib/ffi/tools
-homepage: http://kenai.com/projects/ruby-ffi
-signing_key: 
-name: ffi
-rdoc_options: 
-- -x
-- ext
-- --main
-- README.rdoc
-autorequire: 
-rubyforge_project: ffi
-executables: []
-
-description: A Ruby foreign function interface
-specification_version: 2
-default_executable: 
 files: 
 - LICENSE
 - README.rdoc
@@ -341,23 +344,6 @@ files:
 - lib/ffi/types.rb
 - lib/ffi/union.rb
 - lib/ffi/variadic.rb
-- nbproject/Makefile-Default.mk
-- nbproject/Makefile-impl.mk
-- nbproject/Package-Default.bash
-- nbproject/configurations.xml
-- nbproject/private
-- nbproject/private/configurations.xml
-- nbproject/private/private.xml
-- nbproject/project.properties
-- nbproject/project.xml
-- samples/getlogin.rb
-- samples/getpid.rb
-- samples/gettimeofday.rb
-- samples/hello.rb
-- samples/inotify.rb
-- samples/pty.rb
-- samples/qsort.rb
-- samples/sample_helper.rb
 - spec/ffi
 - spec/ffi/buffer_spec.rb
 - spec/ffi/callback_spec.rb
@@ -378,38 +364,35 @@ files:
 - spec/ffi/union_spec.rb
 - spec/ffi/variadic_spec.rb
 - spec/spec.opts
+has_rdoc: true
+homepage: http://kenai.com/projects/ruby-ffi
+post_install_message: 
+rdoc_options: 
+- -x
+- ext
+- --main
+- README.rdoc
+require_paths: 
+- lib
+- ext
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version 
       version: "0"
   version: 
-extensions: 
-- ext/ffi_c/extconf.rb
-rubygems_version: 1.3.1
 requirements: []
 
-authors: 
-- Wayne Meissner
-date: 2009-03-24 14:00:00 +00:00
-platform: ruby
+rubyforge_project: ffi
+rubygems_version: 1.3.1
+signing_key: 
+specification_version: 2
+summary: A Ruby foreign function interface
 test_files: []
 
-version: !ruby/object:Gem::Version 
-  version: 0.3.2
-require_paths: 
-- lib
-- ext
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - '>='
-      - !ruby/object:Gem::Version 
-        version: 2.4.2
-    version: 
-  type: :development
-  version_requirement: 
-  name: bones
-bindir: bin
-has_rdoc: true

data/nbproject/Makefile-Default.mk

@@ -1,57 +0,0 @@
-#
-# Generated Makefile - do not edit!
-#
-# Edit the Makefile in the project folder instead (../Makefile). Each target
-# has a -pre and a -post target defined where you can add customized code.
-#
-# This makefile implements configuration specific macros and targets.
-
-
-# Environment
-MKDIR=mkdir
-CP=cp
-CCADMIN=CCadmin
-RANLIB=ranlib
-CC=gcc
-CCC=g++
-CXX=g++
-FC=
-
-# Macros
-PLATFORM=GNU-MacOSX
-
-# Include project Makefile
-include ruby-ffi-Makefile.mk
-
-# Object Directory
-OBJECTDIR=build/Default/${PLATFORM}
-
-# Object Files
-OBJECTFILES=
-
-# C Compiler Flags
-CFLAGS=
-
-# CC Compiler Flags
-CCFLAGS=
-CXXFLAGS=
-
-# Fortran Compiler Flags
-FFLAGS=
-
-# Link Libraries and Options
-LDLIBSOPTIONS=
-
-# Build Targets
-.build-conf: ${BUILD_SUBPROJECTS}
-	cd . && rake compile
-
-# Subprojects
-.build-subprojects:
-
-# Clean Targets
-.clean-conf:
-	cd . && rake clean
-
-# Subprojects
-.clean-subprojects:

data/nbproject/Makefile-impl.mk

@@ -1,123 +0,0 @@
-# 
-# Generated Makefile - do not edit! 
-# 
-# Edit the Makefile in the project folder instead (../Makefile). Each target
-# has a pre- and a post- target defined where you can add customization code.
-#
-# This makefile implements macros and targets common to all configurations.
-#
-# NOCDDL
-
-
-# Building and Cleaning subprojects are done by default, but can be controlled with the SUB
-# macro. If SUB=no, subprojects will not be built or cleaned. The following macro
-# statements set BUILD_SUB-CONF and CLEAN_SUB-CONF to .build-reqprojects-conf
-# and .clean-reqprojects-conf unless SUB has the value 'no'
-SUB_no=NO
-SUBPROJECTS=${SUB_${SUB}}
-BUILD_SUBPROJECTS_=.build-subprojects
-BUILD_SUBPROJECTS_NO=
-BUILD_SUBPROJECTS=${BUILD_SUBPROJECTS_${SUBPROJECTS}}
-CLEAN_SUBPROJECTS_=.clean-subprojects
-CLEAN_SUBPROJECTS_NO=
-CLEAN_SUBPROJECTS=${CLEAN_SUBPROJECTS_${SUBPROJECTS}}
-
-
-# Project Name
-PROJECTNAME=ruby-ffi
-
-# Active Configuration
-DEFAULTCONF=Default
-CONF=${DEFAULTCONF}
-
-# All Configurations
-ALLCONFS=Default 
-
-
-# build
-.build-impl: .build-pre .validate-impl .depcheck-impl
-	@#echo "=> Running $@... Configuration=$(CONF)"
-	${MAKE} -f nbproject/Makefile-${CONF}.mk SUBPROJECTS=${SUBPROJECTS} .build-conf
-
-
-# clean
-.clean-impl: .clean-pre .validate-impl .depcheck-impl
-	@#echo "=> Running $@... Configuration=$(CONF)"
-	${MAKE} -f nbproject/Makefile-${CONF}.mk SUBPROJECTS=${SUBPROJECTS} .clean-conf
-
-
-# clobber 
-.clobber-impl: .clobber-pre .depcheck-impl
-	@#echo "=> Running $@..."
-	for CONF in ${ALLCONFS}; \
-	do \
-	    ${MAKE} -f nbproject/Makefile-$${CONF}.mk SUBPROJECTS=${SUBPROJECTS} .clean-conf; \
-	done
-
-# all 
-.all-impl: .all-pre .depcheck-impl
-	@#echo "=> Running $@..."
-	for CONF in ${ALLCONFS}; \
-	do \
-	    ${MAKE} -f nbproject/Makefile-$${CONF}.mk SUBPROJECTS=${SUBPROJECTS} .build-conf; \
-	done
-
-# dependency checking support
-.depcheck-impl:
-	@echo "# This code depends on make tool being used" >.dep.inc
-	@if [ -n "${MAKE_VERSION}" ]; then \
-	    echo "DEPFILES=\$$(wildcard \$$(addsuffix .d, \$${OBJECTFILES}))" >>.dep.inc; \
-	    echo "ifneq (\$${DEPFILES},)" >>.dep.inc; \
-	    echo "include \$${DEPFILES}" >>.dep.inc; \
-	    echo "endif" >>.dep.inc; \
-	else \
-	    echo ".KEEP_STATE:" >>.dep.inc; \
-	    echo ".KEEP_STATE_FILE:.make.state.\$${CONF}" >>.dep.inc; \
-	fi
-
-# configuration validation
-.validate-impl:
-	@if [ ! -f nbproject/Makefile-${CONF}.mk ]; \
-	then \
-	    echo ""; \
-	    echo "Error: can not find the makefile for configuration '${CONF}' in project ${PROJECTNAME}"; \
-	    echo "See 'make help' for details."; \
-	    echo "Current directory: " `pwd`; \
-	    echo ""; \
-	fi
-	@if [ ! -f nbproject/Makefile-${CONF}.mk ]; \
-	then \
-	    exit 1; \
-	fi
-
-
-# help
-.help-impl: .help-pre
-	@echo "This makefile supports the following configurations:"
-	@echo "    ${ALLCONFS}"
-	@echo ""
-	@echo "and the following targets:"
-	@echo "    build  (default target)"
-	@echo "    clean"
-	@echo "    clobber"
-	@echo "    all"
-	@echo "    help"
-	@echo ""
-	@echo "Makefile Usage:"
-	@echo "    make [CONF=<CONFIGURATION>] [SUB=no] build"
-	@echo "    make [CONF=<CONFIGURATION>] [SUB=no] clean"
-	@echo "    make [SUB=no] clobber"
-	@echo "    make [SUB=no] all"
-	@echo "    make help"
-	@echo ""
-	@echo "Target 'build' will build a specific configuration and, unless 'SUB=no',"
-	@echo "    also build subprojects."
-	@echo "Target 'clean' will clean a specific configuration and, unless 'SUB=no',"
-	@echo "    also clean subprojects."
-	@echo "Target 'clobber' will remove all built files from all configurations and,"
-	@echo "    unless 'SUB=no', also from subprojects."
-	@echo "Target 'all' will will build all configurations and, unless 'SUB=no',"
-	@echo "    also build subprojects."
-	@echo "Target 'help' prints this message."
-	@echo ""
-

data/nbproject/Package-Default.bash

@@ -1,72 +0,0 @@
-#!/bin/bash -x
-
-#
-# Generated - do not edit!
-#
-
-# Macros
-TOP=`pwd`
-PLATFORM=GNU-MacOSX
-TMPDIR=build/Default/${PLATFORM}/tmp-packaging
-TMPDIRNAME=tmp-packaging
-OUTPUT_PATH=MissingOutputInProject
-OUTPUT_BASENAME=MissingOutputInProject
-PACKAGE_TOP_DIR=ruby-ffi/
-
-# Functions
-function checkReturnCode
-{
-    rc=$?
-    if [ $rc != 0 ]
-    then
-        exit $rc
-    fi
-}
-function makeDirectory
-# $1 directory path
-# $2 permission (optional)
-{
-    mkdir -p "$1"
-    checkReturnCode
-    if [ "$2" != "" ]
-    then
-      chmod $2 "$1"
-      checkReturnCode
-    fi
-}
-function copyFileToTmpDir
-# $1 from-file path
-# $2 to-file path
-# $3 permission
-{
-    cp "$1" "$2"
-    checkReturnCode
-    if [ "$3" != "" ]
-    then
-        chmod $3 "$2"
-        checkReturnCode
-    fi
-}
-
-# Setup
-cd "${TOP}"
-mkdir -p dist/Default/${PLATFORM}/package
-rm -rf ${TMPDIR}
-mkdir -p ${TMPDIR}
-
-# Copy files and create directories and links
-cd "${TOP}"
-makeDirectory ${TMPDIR}/ruby-ffi/bin
-copyFileToTmpDir "${OUTPUT_PATH}" "${TMPDIR}/${PACKAGE_TOP_DIR}bin/${OUTPUT_BASENAME}" 0755
-
-
-# Generate tar file
-cd "${TOP}"
-rm -f dist/Default/${PLATFORM}/package/ruby-ffi.tar
-cd ${TMPDIR}
-tar -vcf ../../../../dist/Default/${PLATFORM}/package/ruby-ffi.tar *
-checkReturnCode
-
-# Cleanup
-cd "${TOP}"
-rm -rf ${TMPDIR}

data/nbproject/configurations.xml

@@ -1,293 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configurationDescriptor version="51">
-  <logicalFolder name="root" displayName="root" projectFiles="true">
-    <logicalFolder name="ruby-ffi" displayName="ruby-ffi" projectFiles="true">
-      <logicalFolder name="ext" displayName="ext" projectFiles="true">
-        <itemPath>ext/ffi_c/AbstractMemory.c</itemPath>
-        <itemPath>ext/ffi_c/AbstractMemory.h</itemPath>
-        <itemPath>ext/ffi_c/AutoPointer.c</itemPath>
-        <itemPath>ext/ffi_c/AutoPointer.h</itemPath>
-        <itemPath>ext/ffi_c/Buffer.c</itemPath>
-        <itemPath>ext/ffi_c/Callback.c</itemPath>
-        <itemPath>ext/ffi_c/Callback.h</itemPath>
-        <itemPath>ext/ffi_c/compat.h</itemPath>
-        <itemPath>ext/ffi_c/extconf.rb</itemPath>
-        <itemPath>ext/ffi_c/ffi.c</itemPath>
-        <itemPath>ext/ffi_c/Invoker.c</itemPath>
-        <itemPath>ext/ffi_c/MemoryPointer.c</itemPath>
-        <itemPath>ext/ffi_c/MemoryPointer.h</itemPath>
-        <itemPath>ext/ffi_c/NativeLibrary.c</itemPath>
-        <itemPath>ext/ffi_c/NativeLibrary.h</itemPath>
-        <itemPath>ext/ffi_c/NullPointer.c</itemPath>
-        <itemPath>ext/ffi_c/Platform.c</itemPath>
-        <itemPath>ext/ffi_c/Platform.h</itemPath>
-        <itemPath>ext/ffi_c/Pointer.c</itemPath>
-        <itemPath>ext/ffi_c/Pointer.h</itemPath>
-        <itemPath>ext/ffi_c/rbffi.h</itemPath>
-        <itemPath>ext/ffi_c/Struct.c</itemPath>
-        <itemPath>ext/ffi_c/Struct.h</itemPath>
-        <itemPath>ext/ffi_c/Types.c</itemPath>
-        <itemPath>ext/ffi_c/Types.h</itemPath>
-      </logicalFolder>
-      <logicalFolder name="f1" displayName="lib" projectFiles="true">
-        <logicalFolder name="ffi" displayName="ffi" projectFiles="true">
-          <itemPath>lib/ffi/autopointer.rb</itemPath>
-          <itemPath>lib/ffi/callback.rb</itemPath>
-          <itemPath>lib/ffi/ffi.rb</itemPath>
-          <itemPath>lib/ffi/io.rb</itemPath>
-          <itemPath>lib/ffi/library.rb</itemPath>
-          <itemPath>lib/ffi/memorypointer.rb</itemPath>
-          <itemPath>lib/ffi/platform.rb</itemPath>
-          <itemPath>lib/ffi/pointer.rb</itemPath>
-          <itemPath>lib/ffi/struct.rb</itemPath>
-          <itemPath>lib/ffi/types.rb</itemPath>
-          <itemPath>lib/ffi/variadic.rb</itemPath>
-        </logicalFolder>
-        <itemPath>lib/ffi.rb</itemPath>
-      </logicalFolder>
-      <logicalFolder name="libtest" displayName="libtest" projectFiles="true">
-        <itemPath>libtest/Benchmark.c</itemPath>
-        <itemPath>libtest/BufferTest.c</itemPath>
-        <itemPath>libtest/ClosureTest.c</itemPath>
-        <itemPath>libtest/GlobalVariable.c</itemPath>
-        <itemPath>libtest/LastErrorTest.c</itemPath>
-        <itemPath>libtest/NumberTest.c</itemPath>
-        <itemPath>libtest/PointerTest.c</itemPath>
-        <itemPath>libtest/ReferenceTest.c</itemPath>
-        <itemPath>libtest/StringTest.c</itemPath>
-        <itemPath>libtest/StructTest.c</itemPath>
-        <itemPath>libtest/VariadicTest.c</itemPath>
-      </logicalFolder>
-      <logicalFolder name="f2" displayName="spec" projectFiles="true">
-        <itemPath>spec/ffi/buffer_spec.rb</itemPath>
-        <itemPath>spec/ffi/callback_spec.rb</itemPath>
-        <itemPath>spec/ffi/errno_spec.rb</itemPath>
-        <itemPath>spec/ffi/library_spec.rb</itemPath>
-        <itemPath>spec/ffi/managed_struct_spec.rb</itemPath>
-        <itemPath>spec/ffi/number_spec.rb</itemPath>
-        <itemPath>spec/ffi/pointer_spec.rb</itemPath>
-        <itemPath>spec/ffi/spec_helper.rb</itemPath>
-        <itemPath>spec/ffi/string_spec.rb</itemPath>
-        <itemPath>spec/ffi/struct_spec.rb</itemPath>
-        <itemPath>spec/ffi/typedef_spec.rb</itemPath>
-        <itemPath>spec/ffi/union_spec.rb</itemPath>
-        <itemPath>spec/ffi/variadic_spec.rb</itemPath>
-      </logicalFolder>
-    </logicalFolder>
-    <logicalFolder name="ExternalFiles"
-                   displayName="Important Files"
-                   projectFiles="false">
-      <itemPath>Makefile</itemPath>
-      <itemPath>Rakefile</itemPath>
-      <itemPath>ruby-ffi-Makefile.mk</itemPath>
-    </logicalFolder>
-  </logicalFolder>
-  <projectmakefile>ruby-ffi-Makefile.mk</projectmakefile>
-  <confs>
-    <conf name="Default" type="0">
-      <toolsSet>
-        <developmentServer>localhost</developmentServer>
-        <compilerSet>GNU|GNU</compilerSet>
-        <platform>4</platform>
-      </toolsSet>
-      <makefileType>
-        <makeTool>
-          <buildCommandWorkingDir>.</buildCommandWorkingDir>
-          <buildCommand>rake compile</buildCommand>
-          <cleanCommand>rake clean</cleanCommand>
-          <executablePath></executablePath>
-          <cCompilerTool>
-            <includeDirectories>
-              <directoryPath>/opt/local/include</directoryPath>
-            </includeDirectories>
-          </cCompilerTool>
-        </makeTool>
-        <requiredProjects>
-        </requiredProjects>
-      </makefileType>
-      <item path="ext/ffi_c/AbstractMemory.c">
-        <itemTool>0</itemTool>
-      </item>
-      <item path="ext/ffi_c/AbstractMemory.h">
-        <itemTool>3</itemTool>
-      </item>
-      <item path="ext/ffi_c/AutoPointer.c">
-        <itemTool>0</itemTool>
-      </item>
-      <item path="ext/ffi_c/AutoPointer.h">
-        <itemTool>3</itemTool>
-      </item>
-      <item path="ext/ffi_c/Buffer.c">
-        <itemTool>0</itemTool>
-      </item>
-      <item path="ext/ffi_c/Callback.c">
-        <itemTool>0</itemTool>
-      </item>
-      <item path="ext/ffi_c/Callback.h">
-        <itemTool>3</itemTool>
-      </item>
-      <item path="ext/ffi_c/Invoker.c">
-        <itemTool>0</itemTool>
-      </item>
-      <item path="ext/ffi_c/MemoryPointer.c">
-        <itemTool>0</itemTool>
-      </item>
-      <item path="ext/ffi_c/MemoryPointer.h">
-        <itemTool>3</itemTool>
-      </item>
-      <item path="ext/ffi_c/NativeLibrary.c">
-        <itemTool>0</itemTool>
-      </item>
-      <item path="ext/ffi_c/NativeLibrary.h">
-        <itemTool>3</itemTool>
-      </item>
-      <item path="ext/ffi_c/NullPointer.c">
-        <itemTool>0</itemTool>
-      </item>
-      <item path="ext/ffi_c/Platform.c">
-        <itemTool>0</itemTool>
-      </item>
-      <item path="ext/ffi_c/Platform.h">
-        <itemTool>3</itemTool>
-      </item>
-      <item path="ext/ffi_c/Pointer.c">
-        <itemTool>0</itemTool>
-      </item>
-      <item path="ext/ffi_c/Pointer.h">
-        <itemTool>3</itemTool>
-      </item>
-      <item path="ext/ffi_c/Struct.c">
-        <itemTool>0</itemTool>
-      </item>
-      <item path="ext/ffi_c/Struct.h">
-        <itemTool>3</itemTool>
-      </item>
-      <item path="ext/ffi_c/Types.c">
-        <itemTool>0</itemTool>
-      </item>
-      <item path="ext/ffi_c/Types.h">
-        <itemTool>3</itemTool>
-      </item>
-      <item path="ext/ffi_c/compat.h">
-        <itemTool>3</itemTool>
-      </item>
-      <item path="ext/ffi_c/extconf.rb">
-        <itemTool>3</itemTool>
-      </item>
-      <item path="ext/ffi_c/ffi.c">
-        <itemTool>0</itemTool>
-      </item>
-      <item path="ext/ffi_c/rbffi.h">
-        <itemTool>3</itemTool>
-      </item>
-      <item path="lib/ffi.rb">
-        <itemTool>3</itemTool>
-      </item>
-      <item path="lib/ffi/autopointer.rb">
-        <itemTool>3</itemTool>
-      </item>
-      <item path="lib/ffi/callback.rb">
-        <itemTool>3</itemTool>
-      </item>
-      <item path="lib/ffi/ffi.rb">
-        <itemTool>3</itemTool>
-      </item>
-      <item path="lib/ffi/io.rb">
-        <itemTool>3</itemTool>
-      </item>
-      <item path="lib/ffi/library.rb">
-        <itemTool>3</itemTool>
-      </item>
-      <item path="lib/ffi/memorypointer.rb">
-        <itemTool>3</itemTool>
-      </item>
-      <item path="lib/ffi/platform.rb">
-        <itemTool>3</itemTool>
-      </item>
-      <item path="lib/ffi/pointer.rb">
-        <itemTool>3</itemTool>
-      </item>
-      <item path="lib/ffi/struct.rb">
-        <itemTool>3</itemTool>
-      </item>
-      <item path="lib/ffi/types.rb">
-        <itemTool>3</itemTool>
-      </item>
-      <item path="lib/ffi/variadic.rb">
-        <itemTool>3</itemTool>
-      </item>
-      <item path="libtest/Benchmark.c">
-        <itemTool>0</itemTool>
-      </item>
-      <item path="libtest/BufferTest.c">
-        <itemTool>0</itemTool>
-      </item>
-      <item path="libtest/ClosureTest.c">
-        <itemTool>0</itemTool>
-      </item>
-      <item path="libtest/GlobalVariable.c">
-        <itemTool>0</itemTool>
-      </item>
-      <item path="libtest/LastErrorTest.c">
-        <itemTool>0</itemTool>
-      </item>
-      <item path="libtest/NumberTest.c">
-        <itemTool>0</itemTool>
-      </item>
-      <item path="libtest/PointerTest.c">
-        <itemTool>0</itemTool>
-      </item>
-      <item path="libtest/ReferenceTest.c">
-        <itemTool>0</itemTool>
-      </item>
-      <item path="libtest/StringTest.c">
-        <itemTool>0</itemTool>
-      </item>
-      <item path="libtest/StructTest.c">
-        <itemTool>0</itemTool>
-      </item>
-      <item path="libtest/VariadicTest.c">
-        <itemTool>0</itemTool>
-      </item>
-      <item path="spec/ffi/buffer_spec.rb">
-        <itemTool>3</itemTool>
-      </item>
-      <item path="spec/ffi/callback_spec.rb">
-        <itemTool>3</itemTool>
-      </item>
-      <item path="spec/ffi/errno_spec.rb">
-        <itemTool>3</itemTool>
-      </item>
-      <item path="spec/ffi/library_spec.rb">
-        <itemTool>3</itemTool>
-      </item>
-      <item path="spec/ffi/managed_struct_spec.rb">
-        <itemTool>3</itemTool>
-      </item>
-      <item path="spec/ffi/number_spec.rb">
-        <itemTool>3</itemTool>
-      </item>
-      <item path="spec/ffi/pointer_spec.rb">
-        <itemTool>3</itemTool>
-      </item>
-      <item path="spec/ffi/spec_helper.rb">
-        <itemTool>3</itemTool>
-      </item>
-      <item path="spec/ffi/string_spec.rb">
-        <itemTool>3</itemTool>
-      </item>
-      <item path="spec/ffi/struct_spec.rb">
-        <itemTool>3</itemTool>
-      </item>
-      <item path="spec/ffi/typedef_spec.rb">
-        <itemTool>3</itemTool>
-      </item>
-      <item path="spec/ffi/union_spec.rb">
-        <itemTool>3</itemTool>
-      </item>
-      <item path="spec/ffi/variadic_spec.rb">
-        <itemTool>3</itemTool>
-      </item>
-    </conf>
-  </confs>
-</configurationDescriptor>

data/nbproject/private/configurations.xml

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configurationDescriptor version="51">
-  <projectmakefile>ruby-ffi-Makefile.mk</projectmakefile>
-  <defaultConf>0</defaultConf>
-  <confs>
-    <conf name="Default" type="0">
-      <gdbdebugger version="2">
-        <gdb_command>gdb</gdb_command>
-        <array_repeat_threshold>10</array_repeat_threshold>
-      </gdbdebugger>
-      <runprofile version="5">
-        <args></args>
-        <rundir></rundir>
-        <buildfirst>true</buildfirst>
-        <console-type>0</console-type>
-        <terminal-type>0</terminal-type>
-        <environment>
-        </environment>
-      </runprofile>
-    </conf>
-  </confs>
-</configurationDescriptor>

data/nbproject/private/private.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project-private xmlns="http://www.netbeans.org/ns/project-private/1">
-    <code-assistance-data xmlns="http://www.netbeans.org/ns/make-project-private/1">
-        <code-model-enabled>false</code-model-enabled>
-    </code-assistance-data>
-    <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/1"/>
-</project-private>

data/nbproject/project.xml

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://www.netbeans.org/ns/project/1">
-    <type>org.netbeans.modules.cnd.makeproject</type>
-    <configuration>
-        <data xmlns="http://www.netbeans.org/ns/make-project/1">
-            <name>ruby-ffi</name>
-            <make-project-type>0</make-project-type>
-            <c-extensions>c</c-extensions>
-            <cpp-extensions/>
-            <header-extensions>h</header-extensions>
-            <sourceEncoding>UTF-8</sourceEncoding>
-            <make-dep-projects/>
-        </data>
-    </configuration>
-</project>

data/samples/getlogin.rb

@@ -1,7 +0,0 @@
-require 'rubygems'
-require 'ffi'
-module Foo
-  extend FFI::Library
-  attach_function :getlogin, [ ], :string
-end
-puts "getlogin=#{Foo.getlogin}"

data/samples/getpid.rb

@@ -1,7 +0,0 @@
-require 'rubygems'
-require 'ffi'
-module Foo
-  extend FFI::Library
-  attach_function :getpid, [ ], :int
-end
-puts "My pid=#{Foo.getpid}"

data/samples/gettimeofday.rb

@@ -1,17 +0,0 @@
-require 'rubygems'
-require 'ffi'
-class Timeval < FFI::Struct
-  rb_maj, rb_min, rb_micro = RUBY_VERSION.split('.')
-  if rb_maj.to_i >= 1 && rb_min.to_i >= 9 || RUBY_PLATFORM =~ /java/
-    layout :tv_sec => :ulong, :tv_usec => :ulong
-  else
-    layout :tv_sec, :ulong, 0, :tv_usec, :ulong, 4
-  end
-end
-module LibC
-  extend FFI::Library
-  attach_function :gettimeofday, [ :pointer, :pointer ], :int
-end
-t = Timeval.new
-LibC.gettimeofday(t.pointer, nil)
-puts "t.tv_sec=#{t[:tv_sec]} t.tv_usec=#{t[:tv_usec]}"

data/samples/hello.rb

@@ -1,6 +0,0 @@
-require File.expand_path(File.join(File.dirname(__FILE__), "sample_helper"))
-module Foo
-  extend FFI::Library
-  attach_function("cputs", "puts", [ :string ], :int)
-end
-Foo.cputs("Hello, World via libc puts using FFI on MRI ruby")

data/samples/inotify.rb

@@ -1,59 +0,0 @@
-require 'rubygems'
-require 'ffi'
-module Inotify
-  extend FFI::Library
-  class Event < FFI::Struct
-    layout \
-      :wd, :int,
-      :mask, :uint,
-      :cookie, :uint,
-      :len, :uint
-  end
-  attach_function :init, :inotify_init, [ ], :int
-  attach_function :add_watch, :inotify_add_watch, [ :int, :string, :uint ], :int
-  attach_function :rm_watch, :inotify_rm_watch, [ :int, :uint ], :int
-  attach_function :read, [ :int, :buffer_out, :uint ], :int
-  IN_ACCESS=0x00000001
-  IN_MODIFY=0x00000002
-  IN_ATTRIB=0x00000004
-  IN_CLOSE_WRITE=0x00000008
-  IN_CLOSE_NOWRITE=0x00000010
-  IN_CLOSE=(IN_CLOSE_WRITE | IN_CLOSE_NOWRITE)
-  IN_OPEN=0x00000020
-  IN_MOVED_FROM=0x00000040
-  IN_MOVED_TO=0x00000080
-  IN_MOVE= (IN_MOVED_FROM | IN_MOVED_TO)
-  IN_CREATE=0x00000100
-  IN_DELETE=0x00000200
-  IN_DELETE_SELF=0x00000400
-  IN_MOVE_SELF=0x00000800
-  # Events sent by the kernel.
-  IN_UNMOUNT=0x00002000
-  IN_Q_OVERFLOW=0x00004000
-  IN_IGNORED=0x00008000
-  IN_ONLYDIR=0x01000000
-  IN_DONT_FOLLOW=0x02000000
-  IN_MASK_ADD=0x20000000
-  IN_ISDIR=0x40000000
-  IN_ONESHOT=0x80000000
-  IN_ALL_EVENTS=(IN_ACCESS | IN_MODIFY | IN_ATTRIB | IN_CLOSE_WRITE \
-                          | IN_CLOSE_NOWRITE | IN_OPEN | IN_MOVED_FROM \
-                          | IN_MOVED_TO | IN_CREATE | IN_DELETE \
-                          | IN_DELETE_SELF | IN_MOVE_SELF)
-
-end
-if $0 == __FILE__
-  fd = Inotify.init
-  puts "fd=#{fd}"
-  wd = Inotify.add_watch(fd, "/tmp/", Inotify::IN_ALL_EVENTS)
-  fp = FFI::IO.for_fd(fd)
-  puts "wfp=#{fp}"
-  while true
-    buf = FFI::Buffer.alloc_out(Inotify::Event.size + 4096, 1, false)
-    ev = Inotify::Event.new buf
-    ready = IO.select([ fp ], nil, nil, nil)
-    n = Inotify.read(fd, buf, buf.total)
-    puts "Read #{n} bytes from inotify fd"
-    puts "event.wd=#{ev[:wd]} mask=#{ev[:mask]} len=#{ev[:len]} name=#{ev[:len] > 0 ? buf.get_string(16) : 'unknown'}"
-  end
-end

data/samples/pty.rb

@@ -1,75 +0,0 @@
-require 'ffi'
-
-
-module PTY
-  private
-  module LibC
-    extend FFI::Library
-    attach_function :forkpty, [ :buffer_out, :buffer_out, :buffer_in, :buffer_in ], :int
-    attach_function :openpty, [ :buffer_out, :buffer_out, :buffer_out, :buffer_in, :buffer_in ], :int
-    attach_function :login_tty, [ :int ], :int
-    attach_function :close, [ :int ], :int
-    attach_function :strerror, [ :int ], :string
-    attach_function :fork, [], :int
-    attach_function :execv, [ :string, :buffer_in ], :int
-    attach_function :execvp, [ :string, :buffer_in ], :int
-    attach_function :dup2, [ :int, :int ], :int
-    attach_function :dup, [ :int ], :int
-  end
-  Buffer = FFI::Buffer
-  def self.build_args(args)
-    cmd = args.shift
-    cmd_args = args.map do |arg|
-      MemoryPointer.from_string(arg)
-    end
-    exec_args = MemoryPointer.new(:pointer, 1 + cmd_args.length + 1)
-    exec_cmd = MemoryPointer.from_string(cmd)
-    exec_args[0].put_pointer(0, exec_cmd)
-    cmd_args.each_with_index do |arg, i|
-      exec_args[i + 1].put_pointer(0, arg)
-    end
-    [ cmd, exec_args ]
-  end
-  public
-  def self.getpty(*args)
-    mfdp = Buffer.new :int
-    name = Buffer.new 1024
-    #
-    # All the execv setup is done in the parent, since doing anything other than
-    # execv in the child after fork is really flakey
-    #
-    exec_cmd, exec_args = build_args(args)
-    pid = LibC.forkpty(mfdp, name, nil, nil)
-    raise "forkpty failed: #{LibC.strerror(FFI.errno)}" if pid < 0    
-    if pid == 0
-      LibC.execvp(exec_cmd, exec_args)
-      exit 1
-    end
-    masterfd = mfdp.get_int(0)
-    rfp = FFI::IO.for_fd(masterfd, "r")
-    wfp = FFI::IO.for_fd(LibC.dup(masterfd), "w")
-    if block_given?
-      yield rfp, wfp, pid
-      rfp.close unless rfp.closed?
-      wfp.close unless wfp.closed?
-    else
-      [ rfp, wfp, pid ]
-    end
-  end
-  def self.spawn(*args, &block)
-    self.getpty("/bin/sh", "-c", args[0], &block)
-  end
-end
-module LibC
-  extend FFI::Library
-  attach_function :close, [ :int ], :int
-  attach_function :write, [ :int, :buffer_in, :ulong ], :long
-  attach_function :read, [ :int, :buffer_out, :ulong ], :long
-end
-PTY.getpty("/bin/ls", "-alR", "/") { |rfd, wfd, pid|
-#PTY.spawn("ls -laR /") { |rfd, wfd, pid|
-  puts "child pid=#{pid}"
-  while !rfd.eof? && (buf = rfd.gets)
-    puts "child: '#{buf.strip}'"
-  end
-}

data/samples/qsort.rb

@@ -1,20 +0,0 @@
-require 'rubygems'
-require 'ffi'
-
-module LibC
-  extend FFI::Library
-  callback :qsort_cmp, [ :pointer, :pointer ], :int
-  attach_function :qsort, [ :pointer, :int, :int, :qsort_cmp ], :int
-end
-
-p = MemoryPointer.new(:int, 2)
-p.put_array_of_int32(0, [ 2, 1 ])
-puts "ptr=#{p.inspect}"
-puts "Before qsort #{p.get_array_of_int32(0, 2).join(', ')}"
-LibC.qsort(p, 2, 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, 2).join(', ')}"

data/samples/sample_helper.rb

@@ -1,6 +0,0 @@
-require 'rubygems'
-require 'spec'
-
-$:.unshift File.join(File.dirname(__FILE__), "..", "lib"), File.join(File.dirname(__FILE__), "..", "build", RUBY_VERSION) unless RUBY_PLATFORM =~ /java/
-require "ffi"
-