ffi 1.12.2 → 1.15.3
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +132 -0
- data/Gemfile +1 -2
- data/README.md +14 -2
- data/Rakefile +46 -65
- data/ext/ffi_c/AbstractMemory.c +24 -25
- data/ext/ffi_c/Buffer.c +4 -9
- data/ext/ffi_c/Call.c +3 -15
- data/ext/ffi_c/ClosurePool.c +75 -25
- data/ext/ffi_c/ClosurePool.h +3 -1
- data/ext/ffi_c/DynamicLibrary.c +1 -6
- data/ext/ffi_c/Function.c +38 -38
- data/ext/ffi_c/Function.h +0 -4
- data/ext/ffi_c/FunctionInfo.c +3 -8
- data/ext/ffi_c/LastError.c +2 -6
- data/ext/ffi_c/LongDouble.c +5 -3
- data/ext/ffi_c/LongDouble.h +0 -4
- data/ext/ffi_c/MemoryPointer.c +3 -8
- data/ext/ffi_c/MemoryPointer.h +0 -4
- data/ext/ffi_c/MethodHandle.c +21 -31
- data/ext/ffi_c/MethodHandle.h +3 -2
- data/ext/ffi_c/Platform.c +3 -7
- data/ext/ffi_c/Pointer.c +25 -26
- data/ext/ffi_c/Pointer.h +0 -4
- data/ext/ffi_c/Struct.c +3 -6
- data/ext/ffi_c/StructByValue.c +2 -7
- data/ext/ffi_c/StructLayout.c +9 -8
- data/ext/ffi_c/Thread.c +0 -8
- data/ext/ffi_c/Thread.h +1 -9
- data/ext/ffi_c/Type.c +1 -1
- data/ext/ffi_c/Types.c +6 -7
- data/ext/ffi_c/Types.h +3 -4
- data/ext/ffi_c/Variadic.c +14 -9
- data/ext/ffi_c/compat.h +4 -0
- data/ext/ffi_c/extconf.rb +36 -23
- data/ext/ffi_c/libffi/.travis.yml +4 -0
- data/ext/ffi_c/libffi/.travis/bfin-sim.exp +1 -1
- data/ext/ffi_c/libffi/.travis/build.sh +4 -0
- data/ext/ffi_c/libffi/.travis/m32r-sim.exp +1 -1
- data/ext/ffi_c/libffi/.travis/moxie-sim.exp +1 -1
- data/ext/ffi_c/libffi/.travis/or1k-sim.exp +1 -1
- data/ext/ffi_c/libffi/.travis/powerpc-eabisim.exp +1 -1
- data/ext/ffi_c/libffi/.travis/wine-sim.exp +1 -1
- data/ext/ffi_c/libffi/Makefile.am +49 -58
- data/ext/ffi_c/libffi/Makefile.in +93 -58
- data/ext/ffi_c/libffi/README.md +11 -1
- data/ext/ffi_c/libffi/config.guess +552 -331
- data/ext/ffi_c/libffi/config.sub +1321 -1306
- data/ext/ffi_c/libffi/configure +120 -24
- data/ext/ffi_c/libffi/configure.ac +31 -10
- data/ext/ffi_c/libffi/configure.host +32 -20
- data/ext/ffi_c/libffi/fficonfig.h.in +9 -0
- data/ext/ffi_c/libffi/generate-darwin-source-and-headers.py +1 -1
- data/ext/ffi_c/libffi/include/ffi.h.in +8 -0
- data/ext/ffi_c/libffi/libffi.map.in +8 -12
- data/ext/ffi_c/libffi/libtool-version +1 -1
- data/ext/ffi_c/libffi/ltmain.sh +6 -4
- data/ext/ffi_c/libffi/msvcc.sh +11 -11
- data/ext/ffi_c/libffi/src/aarch64/ffi.c +51 -35
- data/ext/ffi_c/libffi/src/aarch64/ffitarget.h +10 -5
- data/ext/ffi_c/libffi/src/aarch64/internal.h +1 -0
- data/ext/ffi_c/libffi/src/aarch64/sysv.S +14 -3
- data/ext/ffi_c/libffi/src/aarch64/win64_armasm.S +1 -1
- data/ext/ffi_c/libffi/src/arm/ffi.c +22 -0
- data/ext/ffi_c/libffi/src/arm/sysv.S +4 -4
- data/ext/ffi_c/libffi/src/closures.c +33 -10
- data/ext/ffi_c/libffi/src/csky/ffi.c +395 -0
- data/ext/ffi_c/libffi/src/csky/ffitarget.h +63 -0
- data/ext/ffi_c/libffi/src/csky/sysv.S +371 -0
- data/ext/ffi_c/libffi/src/dlmalloc.c +1 -1
- data/ext/ffi_c/libffi/src/kvx/asm.h +5 -0
- data/ext/ffi_c/libffi/src/kvx/ffi.c +273 -0
- data/ext/ffi_c/libffi/src/kvx/ffitarget.h +75 -0
- data/ext/ffi_c/libffi/src/kvx/sysv.S +127 -0
- data/ext/ffi_c/libffi/src/mips/ffi.c +5 -1
- data/ext/ffi_c/libffi/src/mips/ffitarget.h +1 -1
- data/ext/ffi_c/libffi/src/pa/ffi.c +46 -91
- data/ext/ffi_c/libffi/src/pa/ffitarget.h +1 -6
- data/ext/ffi_c/libffi/src/pa/hpux32.S +4 -2
- data/ext/ffi_c/libffi/src/pa/linux.S +4 -2
- data/ext/ffi_c/libffi/src/powerpc/ffi_darwin.c +13 -1
- data/ext/ffi_c/libffi/src/powerpc/ffi_powerpc.h +1 -1
- data/ext/ffi_c/libffi/src/powerpc/linux64.S +8 -0
- data/ext/ffi_c/libffi/src/powerpc/linux64_closure.S +13 -1
- data/ext/ffi_c/libffi/src/powerpc/sysv.S +5 -7
- data/ext/ffi_c/libffi/src/prep_cif.c +1 -1
- data/ext/ffi_c/libffi/src/x86/ffi.c +15 -6
- data/ext/ffi_c/libffi/src/x86/ffi64.c +17 -8
- data/ext/ffi_c/libffi/src/x86/ffitarget.h +15 -2
- data/ext/ffi_c/libffi/src/x86/ffiw64.c +15 -8
- data/ext/ffi_c/libffi/src/x86/sysv.S +15 -6
- data/ext/ffi_c/libffi/src/x86/unix64.S +59 -4
- data/ext/ffi_c/libffi/src/x86/win64.S +7 -3
- data/ext/ffi_c/libffi/src/x86/win64_intel.S +3 -2
- data/ext/ffi_c/libffi/testsuite/lib/libffi.exp +22 -2
- data/ext/ffi_c/libffi/testsuite/libffi.bhaible/test-call.c +4 -4
- data/ext/ffi_c/libffi/testsuite/libffi.bhaible/test-callback.c +2 -2
- data/ext/ffi_c/libffi/testsuite/libffi.closures/huge_struct.c +2 -0
- data/ffi.gemspec +2 -2
- data/lib/ffi.rb +10 -3
- data/lib/ffi/abstract_memory.rb +44 -0
- data/lib/ffi/autopointer.rb +1 -1
- data/lib/ffi/ffi.rb +1 -0
- data/lib/ffi/io.rb +3 -3
- data/lib/ffi/library.rb +7 -3
- data/lib/ffi/managedstruct.rb +2 -2
- data/lib/ffi/platform.rb +18 -8
- data/lib/ffi/platform/aarch64-darwin/types.conf +130 -0
- data/lib/ffi/platform/aarch64-freebsd/types.conf +2 -2
- data/lib/ffi/platform/aarch64-freebsd12/types.conf +113 -60
- data/lib/ffi/platform/aarch64-openbsd/types.conf +134 -0
- data/lib/ffi/platform/arm-linux/types.conf +32 -4
- data/lib/ffi/platform/i386-windows/types.conf +26 -79
- data/lib/ffi/platform/powerpc-linux/types.conf +32 -2
- data/lib/ffi/platform/powerpc-openbsd/types.conf +156 -0
- data/lib/ffi/platform/powerpc64le-linux/types.conf +100 -0
- data/lib/ffi/platform/riscv64-linux/types.conf +104 -0
- data/lib/ffi/platform/sparcv9-openbsd/types.conf +156 -0
- data/lib/ffi/platform/x86_64-darwin/types.conf +4 -0
- data/lib/ffi/platform/x86_64-dragonflybsd/types.conf +4 -22
- data/lib/ffi/platform/x86_64-haiku/types.conf +117 -0
- data/lib/ffi/platform/x86_64-linux/types.conf +21 -0
- data/lib/ffi/platform/x86_64-msys/types.conf +119 -0
- data/lib/ffi/platform/x86_64-windows/types.conf +10 -78
- data/lib/ffi/pointer.rb +21 -14
- data/lib/ffi/struct.rb +8 -2
- data/lib/ffi/tools/const_generator.rb +2 -1
- data/lib/ffi/tools/struct_generator.rb +2 -1
- data/lib/ffi/tools/types_generator.rb +2 -0
- data/lib/ffi/variadic.rb +1 -10
- data/lib/ffi/version.rb +1 -1
- data/rakelib/ffi_gem_helper.rb +65 -0
- data/samples/getlogin.rb +1 -1
- data/samples/getpid.rb +1 -1
- data/samples/gettimeofday.rb +8 -8
- data/samples/hello.rb +2 -1
- data/samples/inotify.rb +1 -1
- data/samples/pty.rb +1 -2
- data/samples/qsort.rb +0 -1
- metadata +21 -12
- data/.appveyor.yml +0 -27
- data/.gitignore +0 -25
- data/.gitmodules +0 -4
- data/.travis.yml +0 -44
- data/.yardopts +0 -5
- data/ext/ffi_c/win32/stdbool.h +0 -8
- data/ext/ffi_c/win32/stdint.h +0 -201
- data/samples/sample_helper.rb +0 -6
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 64acbe6068a72fc276ab3f25bc3819921a0ffe01a0d5e0e87ab32a89aeae32e6
|
4
|
+
data.tar.gz: 5d7d19abdf7e0f071edf0ff6dfd01e061bcc5edebc7f28133f58dd83789cdc8c
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 5b013541765cc7c9dc4fd14373eb47b1875ab36dab9e4044bb99cbc362932fc0a2ac2ef2d802e672304407187163c1a65246e8b5d82cdcb6ce1b2711e2995dcc
|
7
|
+
data.tar.gz: 6f47e3a6521db25b2dac5b01b295e2831d87ded589dd14658edf7aaa82af51faba4be3fb0fd93fe41a693c6fc803ba3eb53466605cf682d33915c824a8440ec2
|
data/CHANGELOG.md
CHANGED
@@ -1,3 +1,135 @@
|
|
1
|
+
1.15.3 / 2021-06-16
|
2
|
+
-------------------
|
3
|
+
|
4
|
+
Fixed:
|
5
|
+
* Fix temporary packaging issue with libffi. #904
|
6
|
+
|
7
|
+
|
8
|
+
1.15.2 / 2021-06-16
|
9
|
+
-------------------
|
10
|
+
|
11
|
+
Added:
|
12
|
+
* Add support for Windows MINGW-UCRT build. #903
|
13
|
+
* Add `/opt/homebrew/lib/` to fallback search paths to improve homebrew support. #880 #882
|
14
|
+
|
15
|
+
Changed:
|
16
|
+
* Regenerate `types.conf` for FreeBSD12 aarch64. #902
|
17
|
+
|
18
|
+
|
19
|
+
1.15.1 / 2021-05-22
|
20
|
+
-------------------
|
21
|
+
|
22
|
+
Fixed:
|
23
|
+
* Append -pthread to linker options. #893
|
24
|
+
* Use arm or aarch64 to identify Apple ARM CPU arch. #899
|
25
|
+
* Allow overriding `gcc` with the `CC` env var in `const_generator.rb` and `struct_generator.rb`. #897
|
26
|
+
|
27
|
+
|
28
|
+
1.15.0 / 2021-03-05
|
29
|
+
-------------------
|
30
|
+
|
31
|
+
Fixed:
|
32
|
+
* Fix MSVC build
|
33
|
+
* Fix async callbacks in conjunction with fork(). #884
|
34
|
+
|
35
|
+
Added:
|
36
|
+
* Allow to pass callbacks in varargs. #885
|
37
|
+
* Name the threads for FFI callback dispatcher and async thread calls for easier debugging. #883
|
38
|
+
The name can be retrieved by Thread.name and is shown by Thread.list.inspect etc.
|
39
|
+
Even gdb shows the thread name on supported operating systems.
|
40
|
+
* Add types.conf for powerpc64le-linux
|
41
|
+
* Add types.conf for riscv64-linux
|
42
|
+
* More release automation of ffi gems
|
43
|
+
|
44
|
+
Changed:
|
45
|
+
* Switch from rubygems-tasks to bundler/gem_helper
|
46
|
+
|
47
|
+
Removed:
|
48
|
+
* Remove unused VariadicInvoker#init
|
49
|
+
|
50
|
+
|
51
|
+
1.14.2 / 2020-12-21
|
52
|
+
-------------------
|
53
|
+
|
54
|
+
Fixed:
|
55
|
+
* Fix builtin libffi on newer Ubuntu caused by an outdated Makefile.in . #863
|
56
|
+
|
57
|
+
|
58
|
+
1.14.1 / 2020-12-19
|
59
|
+
-------------------
|
60
|
+
|
61
|
+
Changed:
|
62
|
+
* Revert changes to FFI::Pointer#write_string made in ffi-1.14.0.
|
63
|
+
It breaks compatibilty in a way that can cause hard to find errors. #857
|
64
|
+
|
65
|
+
|
66
|
+
1.14.0 / 2020-12-18
|
67
|
+
-------------------
|
68
|
+
|
69
|
+
Added:
|
70
|
+
* Add types.conf for x86_64-msys, x86_64-haiku, aarch64-openbsd and aarch64-darwin (alias arm64-darwin)
|
71
|
+
* Add method AbstractMemory#size_limit? . #829
|
72
|
+
* Add new extconf option --enable-libffi-alloc which is enabled per default on Apple M1 (arm64-darwin).
|
73
|
+
|
74
|
+
Changed:
|
75
|
+
* Do NULL pointer check only when array length > 0 . #305
|
76
|
+
* Raise an error on an unknown order argument. #830
|
77
|
+
* Change FFI::Pointer#write_string to terminate with a NUL byte like other string methods. #805
|
78
|
+
* Update bundled libffi to latest master.
|
79
|
+
|
80
|
+
Removed:
|
81
|
+
* Remove win32/stdint.h and stdbool.h because of copyright issue. #693
|
82
|
+
|
83
|
+
Fixed:
|
84
|
+
* Fix possible UTF-8 load error in loader script interpretation. #792
|
85
|
+
* Fix segfault on non-array argument to #write_array_of_*
|
86
|
+
* Fix memory leak in MethodHandle . #815
|
87
|
+
* Fix possible segfault in combination with fiddle or other libffi using gems . #835
|
88
|
+
* Fix possibility to use ffi ruby gem with JRuby-9.3 . #763
|
89
|
+
* Fix a GC issue, when a callback Proc is used on more than 2 callback signatures. #820
|
90
|
+
|
91
|
+
|
92
|
+
1.13.1 / 2020-06-09
|
93
|
+
-------------------
|
94
|
+
|
95
|
+
Changed:
|
96
|
+
* Revert use of `ucrtbase.dll` as default C library on Windows-MINGW.
|
97
|
+
`ucrtbase.dll` is still used on MSWIN target. #790
|
98
|
+
* Test for `ffi_prep_closure_loc()` to make sure we can use this function.
|
99
|
+
This fixes incorrect use of system libffi on MacOS Mojave (10.14). #787
|
100
|
+
* Update types.conf on x86_64-dragonflybsd
|
101
|
+
|
102
|
+
|
103
|
+
1.13.0 / 2020-06-01
|
104
|
+
-------------------
|
105
|
+
|
106
|
+
Added:
|
107
|
+
* Add TruffleRuby support. Almost all specs are running on TruffleRuby and succeed. #768
|
108
|
+
* Add ruby source files to the java gem. This allows to ship the Ruby library code per platform java gem and add it as a default gem to JRuby. #763
|
109
|
+
* Add FFI::Platform::LONG_DOUBLE_SIZE
|
110
|
+
* Add bounds checks for writing to an inline char[] . #756
|
111
|
+
* Add long double as callback return value. #771
|
112
|
+
* Update type definitions and add types from stdint.h and stddef.h on i386-windows, x86_64-windows, x86_64-darwin, x86_64-linux, arm-linux, powerpc-linux. #749
|
113
|
+
* Add new type definitions for powerpc-openbsd and sparcv9-openbsd. #775, #778
|
114
|
+
|
115
|
+
Changed:
|
116
|
+
* Raise required ruby version to >= 2.3.
|
117
|
+
* Lots of cleanups and improvements in library, specs and benchmarks.
|
118
|
+
* Fix a lot of compiler warnings at the C-extension
|
119
|
+
* Fix several install issues on MacOS:
|
120
|
+
* Look for libffi in SDK paths, since recent versions of macOS removed it from `/usr/include` . #757
|
121
|
+
* Fix error `ld: library not found for -lgcc_s.10.4`
|
122
|
+
* Don't built for i386 architecture as it is deprecated
|
123
|
+
* Several fixes for MSVC build on Windows. #779
|
124
|
+
* Use `ucrtbase.dll` as default C library on Windows instead of old `msvcrt.dll`. #779
|
125
|
+
* Update builtin libffi to fix a Powerpc issue with parameters of type long
|
126
|
+
* Allow unmodified sourcing of (the ruby code of) this gem in JRuby and TruffleRuby as a default gem. #747
|
127
|
+
* Improve check to detect if a module has a #find_type method suitable for FFI. This fixes compatibility with stdlib `mkmf` . #776
|
128
|
+
|
129
|
+
Removed:
|
130
|
+
* Reject callback with `:string` return type at definition, because it didn't work so far and is not save to use. #751, #782
|
131
|
+
|
132
|
+
|
1
133
|
1.12.2 / 2020-02-01
|
2
134
|
-------------------
|
3
135
|
|
data/Gemfile
CHANGED
@@ -5,8 +5,7 @@ group :development do
|
|
5
5
|
gem 'rake-compiler', '~> 1.0.3'
|
6
6
|
gem 'rake-compiler-dock', '~> 1.0'
|
7
7
|
gem 'rspec', '~> 3.0'
|
8
|
-
gem '
|
9
|
-
gem "rubysl", "~> 2.0", :platforms => 'rbx'
|
8
|
+
gem 'bundler', '>= 1.16', '< 3'
|
10
9
|
end
|
11
10
|
|
12
11
|
group :doc do
|
data/README.md
CHANGED
@@ -1,4 +1,4 @@
|
|
1
|
-
# Ruby-FFI https://github.com/ffi/ffi/wiki [![Build Status](https://travis-ci.
|
1
|
+
# Ruby-FFI https://github.com/ffi/ffi/wiki [![Build Status](https://travis-ci.com/ffi/ffi.svg?branch=master)](https://travis-ci.com/ffi/ffi) [![Build status Windows](https://ci.appveyor.com/api/projects/status/r8wxn1sd4s794gg1/branch/master?svg=true)](https://ci.appveyor.com/project/larskanis/ffi-aofqa/branch/master)
|
2
2
|
|
3
3
|
## Description
|
4
4
|
|
@@ -62,14 +62,26 @@ On JRuby and TruffleRuby, there are no requirements to install the FFI gem, and
|
|
62
62
|
From rubygems:
|
63
63
|
|
64
64
|
[sudo] gem install ffi
|
65
|
+
|
66
|
+
From a Gemfile using git or GitHub
|
67
|
+
|
68
|
+
gem 'ffi', github: 'ffi/ffi', submodules: true
|
65
69
|
|
66
70
|
or from the git repository on github:
|
67
71
|
|
68
72
|
git clone git://github.com/ffi/ffi.git
|
69
|
-
git submodule update --init --recursive
|
70
73
|
cd ffi
|
74
|
+
git submodule update --init --recursive
|
75
|
+
bundle install
|
71
76
|
rake install
|
72
77
|
|
78
|
+
### Install options:
|
79
|
+
|
80
|
+
* `--enable-system-libffi` : Force usage of system libffi
|
81
|
+
* `--disable-system-libffi` : Force usage of builtin libffi
|
82
|
+
* `--enable-libffi-alloc` : Force closure allocation by libffi
|
83
|
+
* `--disable-libffi-alloc` : Force closure allocation by builtin method
|
84
|
+
|
73
85
|
## License
|
74
86
|
|
75
87
|
The ffi library is covered by the BSD license, also see the LICENSE file.
|
data/Rakefile
CHANGED
@@ -1,36 +1,20 @@
|
|
1
|
-
require 'rubygems/tasks'
|
2
1
|
require 'rbconfig'
|
3
|
-
require 'rake/clean'
|
4
|
-
require File.expand_path("./lib/ffi/version")
|
5
|
-
|
6
2
|
require 'date'
|
7
3
|
require 'fileutils'
|
8
4
|
require 'rbconfig'
|
9
5
|
require 'rspec/core/rake_task'
|
10
6
|
require 'rubygems/package_task'
|
11
|
-
|
12
|
-
|
13
|
-
|
14
|
-
end
|
7
|
+
require 'rake/extensiontask'
|
8
|
+
require_relative "lib/ffi/version"
|
9
|
+
require_relative "rakelib/ffi_gem_helper"
|
15
10
|
|
16
11
|
BUILD_DIR = "build"
|
17
12
|
BUILD_EXT_DIR = File.join(BUILD_DIR, "#{RbConfig::CONFIG['arch']}", 'ffi_c', RUBY_VERSION)
|
18
13
|
|
19
|
-
|
20
|
-
@gem_spec ||= Gem::Specification.load('ffi.gemspec')
|
21
|
-
end
|
14
|
+
gem_spec = Bundler.load_gemspec('ffi.gemspec')
|
22
15
|
|
23
|
-
|
24
|
-
|
25
|
-
RSpec::Core::RakeTask.new(:spec) do |config|
|
26
|
-
config.rspec_opts = YAML.load_file 'spec/spec.opts'
|
27
|
-
end
|
28
|
-
else
|
29
|
-
RSpec::Core::RakeTask.new(:spec => :compile) do |config|
|
30
|
-
config.rspec_opts = YAML.load_file 'spec/spec.opts'
|
31
|
-
end
|
32
|
-
|
33
|
-
TEST_DEPS.unshift :compile
|
16
|
+
RSpec::Core::RakeTask.new(:spec => :compile) do |config|
|
17
|
+
config.rspec_opts = YAML.load_file 'spec/spec.opts'
|
34
18
|
end
|
35
19
|
|
36
20
|
desc "Build all packages"
|
@@ -50,6 +34,13 @@ CLEAN.include "pkg/ffi-*-{mingw32,java}"
|
|
50
34
|
CLEAN.include 'lib/1.*'
|
51
35
|
CLEAN.include 'lib/2.*'
|
52
36
|
|
37
|
+
# clean all shipped files, that are not in git
|
38
|
+
CLEAN.include(
|
39
|
+
gem_spec.files -
|
40
|
+
`git --git-dir ext/ffi_c/libffi/.git ls-files -z`.split("\x0").map { |f| File.join("ext/ffi_c/libffi", f) } -
|
41
|
+
`git ls-files -z`.split("\x0")
|
42
|
+
)
|
43
|
+
|
53
44
|
task :distclean => :clobber
|
54
45
|
|
55
46
|
desc "Test the extension"
|
@@ -58,37 +49,29 @@ task :test => [ :spec ]
|
|
58
49
|
|
59
50
|
namespace :bench do
|
60
51
|
ITER = ENV['ITER'] ? ENV['ITER'].to_i : 100000
|
61
|
-
|
62
|
-
bench_files = Dir["bench/bench_*.rb"].reject { |f| f == "bench/bench_helper.rb" }
|
52
|
+
bench_files = Dir["bench/bench_*.rb"].sort.reject { |f| f == "bench/bench_helper.rb" }
|
63
53
|
bench_files.each do |bench|
|
64
|
-
task File.basename(bench, ".rb")[6..-1] =>
|
65
|
-
sh %{#{Gem.ruby} #{
|
54
|
+
task File.basename(bench, ".rb")[6..-1] => :compile do
|
55
|
+
sh %{#{Gem.ruby} #{bench} #{ITER}}
|
66
56
|
end
|
67
57
|
end
|
68
|
-
task :all =>
|
58
|
+
task :all => :compile do
|
69
59
|
bench_files.each do |bench|
|
70
|
-
sh %{#{Gem.ruby} #{
|
60
|
+
sh %{#{Gem.ruby} #{bench}}
|
71
61
|
end
|
72
62
|
end
|
73
63
|
end
|
74
64
|
|
75
|
-
task 'spec:run' =>
|
76
|
-
task 'spec:specdoc' =>
|
65
|
+
task 'spec:run' => :compile
|
66
|
+
task 'spec:specdoc' => :compile
|
77
67
|
|
78
68
|
task :default => :spec
|
79
69
|
|
80
70
|
namespace 'java' do
|
81
71
|
|
82
|
-
java_gem_spec =
|
83
|
-
s.
|
84
|
-
s.
|
85
|
-
s.author = gem_spec.author
|
86
|
-
s.email = gem_spec.email
|
87
|
-
s.homepage = gem_spec.homepage
|
88
|
-
s.summary = gem_spec.summary
|
89
|
-
s.description = gem_spec.description
|
90
|
-
s.files = %w(LICENSE COPYING README.md CHANGELOG.md Rakefile)
|
91
|
-
s.license = gem_spec.license
|
72
|
+
java_gem_spec = gem_spec.dup.tap do |s|
|
73
|
+
s.files.reject! { |f| File.fnmatch?("ext/*", f) }
|
74
|
+
s.extensions = []
|
92
75
|
s.platform = 'java'
|
93
76
|
end
|
94
77
|
|
@@ -101,36 +84,35 @@ end
|
|
101
84
|
|
102
85
|
task 'gem:java' => 'java:gem'
|
103
86
|
|
104
|
-
|
87
|
+
FfiGemHelper.install_tasks
|
88
|
+
# Register windows gems to be pushed to rubygems.org
|
89
|
+
Bundler::GemHelper.instance.cross_platforms = %w[x86-mingw32 x64-mingw32]
|
90
|
+
|
91
|
+
if RUBY_ENGINE == 'ruby' || RUBY_ENGINE == 'rbx'
|
105
92
|
require 'rake/extensiontask'
|
106
93
|
Rake::ExtensionTask.new('ffi_c', gem_spec) do |ext|
|
107
94
|
ext.name = 'ffi_c' # indicate the name of the extension.
|
108
95
|
# ext.lib_dir = BUILD_DIR # put binaries into this folder.
|
109
96
|
ext.tmp_dir = BUILD_DIR # temporary folder used during compilation.
|
110
97
|
ext.cross_compile = true # enable cross compilation (requires cross compile toolchain)
|
111
|
-
ext.cross_platform =
|
98
|
+
ext.cross_platform = Bundler::GemHelper.instance.cross_platforms
|
112
99
|
ext.cross_compiling do |spec|
|
113
100
|
spec.files.reject! { |path| File.fnmatch?('ext/*', path) }
|
114
101
|
end
|
115
|
-
end
|
116
|
-
|
117
|
-
# To reduce the gem file size strip mingw32 dlls before packaging
|
118
|
-
ENV['RUBY_CC_VERSION'].to_s.split(':').each do |ruby_version|
|
119
|
-
task "build/i386-mingw32/stage/lib/#{ruby_version[/^\d+\.\d+/]}/ffi_c.so" do |t|
|
120
|
-
sh "i686-w64-mingw32-strip -S build/i386-mingw32/stage/lib/#{ruby_version[/^\d+\.\d+/]}/ffi_c.so"
|
121
|
-
end
|
122
102
|
|
123
|
-
|
124
|
-
|
125
|
-
|
103
|
+
end
|
104
|
+
else
|
105
|
+
task :compile do
|
106
|
+
STDERR.puts "Nothing to compile on #{RUBY_ENGINE}"
|
126
107
|
end
|
127
108
|
end
|
128
109
|
|
110
|
+
|
129
111
|
desc "build a windows gem without all the ceremony"
|
130
112
|
task "gem:windows" do
|
131
113
|
require "rake_compiler_dock"
|
132
114
|
sh "bundle package"
|
133
|
-
RakeCompilerDock.sh "sudo apt-get update && sudo apt-get install -y libltdl-dev && bundle --local && rake cross native gem MAKE='nice make -j`nproc`'"
|
115
|
+
RakeCompilerDock.sh "sudo apt-get update && sudo apt-get install -y libltdl-dev && bundle --local && rake cross native gem MAKE='nice make -j`nproc`' RUBY_CC_VERSION=${RUBY_CC_VERSION/:2.2.2/}"
|
134
116
|
end
|
135
117
|
|
136
118
|
directory "ext/ffi_c/libffi"
|
@@ -142,7 +124,7 @@ task :libffi => "ext/ffi_c/libffi/autogen.sh"
|
|
142
124
|
|
143
125
|
LIBFFI_GIT_FILES = `git --git-dir ext/ffi_c/libffi/.git ls-files -z`.split("\x0")
|
144
126
|
|
145
|
-
# Generate files in gemspec but not in libffi's git repo by running autogen.sh
|
127
|
+
# Generate files which are in the gemspec but not in libffi's git repo by running autogen.sh
|
146
128
|
gem_spec.files.select do |f|
|
147
129
|
f =~ /ext\/ffi_c\/libffi\/(.*)/ && !LIBFFI_GIT_FILES.include?($1)
|
148
130
|
end.each do |f|
|
@@ -158,16 +140,20 @@ end.each do |f|
|
|
158
140
|
end
|
159
141
|
end
|
160
142
|
|
161
|
-
|
162
|
-
|
143
|
+
# Make sure we have all gemspec files before packaging
|
144
|
+
task :build => gem_spec.files
|
145
|
+
task :gem => :build
|
146
|
+
|
147
|
+
|
148
|
+
require_relative "lib/ffi/platform"
|
163
149
|
types_conf = File.expand_path(File.join(FFI::Platform::CONF_DIR, 'types.conf'))
|
164
150
|
logfile = File.join(File.dirname(__FILE__), 'types_log')
|
165
151
|
|
166
|
-
|
152
|
+
task types_conf do |task|
|
167
153
|
require 'fileutils'
|
168
|
-
|
154
|
+
require_relative "lib/ffi/tools/types_generator"
|
169
155
|
options = {}
|
170
|
-
FileUtils.mkdir_p(File.dirname(task.name),
|
156
|
+
FileUtils.mkdir_p(File.dirname(task.name), mode: 0755 )
|
171
157
|
File.open(task.name, File::CREAT|File::TRUNC|File::RDWR, 0644) do |f|
|
172
158
|
f.puts FFI::TypesGenerator.generate(options)
|
173
159
|
end
|
@@ -177,12 +163,7 @@ file types_conf => File.join("lib", "ffi", "version.rb") do |task|
|
|
177
163
|
end
|
178
164
|
|
179
165
|
desc "Create or update type information for platform #{FFI::Platform::NAME}"
|
180
|
-
task :types_conf => types_conf
|
181
|
-
end
|
182
|
-
|
183
|
-
Gem::Tasks.new do |t|
|
184
|
-
t.scm.tag.format = '%s'
|
185
|
-
end
|
166
|
+
task :types_conf => types_conf
|
186
167
|
|
187
168
|
begin
|
188
169
|
require 'yard'
|
data/ext/ffi_c/AbstractMemory.c
CHANGED
@@ -32,12 +32,9 @@
|
|
32
32
|
#include <sys/types.h>
|
33
33
|
#ifndef _MSC_VER
|
34
34
|
# include <sys/param.h>
|
35
|
-
# include <stdint.h>
|
36
|
-
# include <stdbool.h>
|
37
|
-
#else
|
38
|
-
# include "win32/stdbool.h"
|
39
|
-
# include "win32/stdint.h"
|
40
35
|
#endif
|
36
|
+
#include <stdint.h>
|
37
|
+
#include <stdbool.h>
|
41
38
|
|
42
39
|
#include <limits.h>
|
43
40
|
#include <ruby.h>
|
@@ -135,11 +132,13 @@ static VALUE memory_put_array_of_##name(VALUE self, VALUE offset, VALUE ary); \
|
|
135
132
|
static VALUE \
|
136
133
|
memory_put_array_of_##name(VALUE self, VALUE offset, VALUE ary) \
|
137
134
|
{ \
|
138
|
-
long count
|
135
|
+
long count; \
|
139
136
|
long off = NUM2LONG(offset); \
|
140
137
|
AbstractMemory* memory = MEMORY(self); \
|
141
138
|
long i; \
|
142
|
-
|
139
|
+
Check_Type(ary, T_ARRAY); \
|
140
|
+
count = RARRAY_LEN(ary); \
|
141
|
+
if (likely(count > 0)) checkWrite(memory); \
|
143
142
|
checkBounds(memory, off, count * sizeof(type)); \
|
144
143
|
for (i = 0; i < count; i++) { \
|
145
144
|
type tmp = (type) VAL(toNative(RARRAY_PTR(ary)[i]), swap); \
|
@@ -162,7 +161,7 @@ memory_get_array_of_##name(VALUE self, VALUE offset, VALUE length) \
|
|
162
161
|
AbstractMemory* memory = MEMORY(self); \
|
163
162
|
VALUE retVal = rb_ary_new2(count); \
|
164
163
|
long i; \
|
165
|
-
checkRead(memory); \
|
164
|
+
if (likely(count > 0)) checkRead(memory); \
|
166
165
|
checkBounds(memory, off, count * sizeof(type)); \
|
167
166
|
for (i = 0; i < count; ++i) { \
|
168
167
|
type tmp; \
|
@@ -209,13 +208,13 @@ SWAPU16(uint16_t x)
|
|
209
208
|
((x >> 40) & 0x000000000000ff00ULL) | \
|
210
209
|
((x >> 56) & 0x00000000000000ffULL))
|
211
210
|
|
212
|
-
static inline int32_t
|
211
|
+
static inline int32_t
|
213
212
|
SWAPS32(int32_t x)
|
214
213
|
{
|
215
214
|
return bswap32(x);
|
216
215
|
}
|
217
216
|
|
218
|
-
static inline uint32_t
|
217
|
+
static inline uint32_t
|
219
218
|
SWAPU32(uint32_t x)
|
220
219
|
{
|
221
220
|
return bswap32(x);
|
@@ -450,7 +449,7 @@ memory_get_array_of_string(int argc, VALUE* argv, VALUE self)
|
|
450
449
|
int i;
|
451
450
|
|
452
451
|
checkBounds(ptr, off, count * sizeof (char*));
|
453
|
-
|
452
|
+
|
454
453
|
for (i = 0; i < count; ++i) {
|
455
454
|
const char* strptr = *((const char**) (ptr->address + off) + i);
|
456
455
|
rb_ary_push(retVal, (strptr == NULL ? Qnil : rb_str_new2(strptr)));
|
@@ -477,7 +476,7 @@ memory_get_array_of_string(int argc, VALUE* argv, VALUE self)
|
|
477
476
|
* @param [Numeric] count number of strings to get. If nil, return all strings
|
478
477
|
* @return [Array<String>]
|
479
478
|
*/
|
480
|
-
static VALUE
|
479
|
+
static VALUE
|
481
480
|
memory_read_array_of_string(int argc, VALUE* argv, VALUE self)
|
482
481
|
{
|
483
482
|
VALUE* rargv = ALLOCA_N(VALUE, argc + 1);
|
@@ -535,13 +534,13 @@ memory_get_bytes(VALUE self, VALUE offset, VALUE length)
|
|
535
534
|
{
|
536
535
|
AbstractMemory* ptr = MEMORY(self);
|
537
536
|
long off, len;
|
538
|
-
|
537
|
+
|
539
538
|
off = NUM2LONG(offset);
|
540
539
|
len = NUM2LONG(length);
|
541
540
|
|
542
541
|
checkRead(ptr);
|
543
542
|
checkBounds(ptr, off, len);
|
544
|
-
|
543
|
+
|
545
544
|
return rb_str_new((char *) ptr->address + off, len);
|
546
545
|
}
|
547
546
|
|
@@ -595,7 +594,7 @@ memory_put_bytes(int argc, VALUE* argv, VALUE self)
|
|
595
594
|
* equivalent to :
|
596
595
|
* memory.get_bytes(0, length)
|
597
596
|
*/
|
598
|
-
static VALUE
|
597
|
+
static VALUE
|
599
598
|
memory_read_bytes(VALUE self, VALUE length)
|
600
599
|
{
|
601
600
|
return memory_get_bytes(self, INT2FIX(0), length);
|
@@ -610,7 +609,7 @@ memory_read_bytes(VALUE self, VALUE length)
|
|
610
609
|
* equivalent to :
|
611
610
|
* memory.put_bytes(0, str, index, length)
|
612
611
|
*/
|
613
|
-
static VALUE
|
612
|
+
static VALUE
|
614
613
|
memory_write_bytes(int argc, VALUE* argv, VALUE self)
|
615
614
|
{
|
616
615
|
VALUE* wargv = ALLOCA_N(VALUE, argc + 1);
|
@@ -643,7 +642,7 @@ memory_type_size(VALUE self)
|
|
643
642
|
* Document-method: []
|
644
643
|
* call-seq: memory[idx]
|
645
644
|
* @param [Numeric] idx index to access in memory
|
646
|
-
* @return
|
645
|
+
* @return
|
647
646
|
* Memory read accessor.
|
648
647
|
*/
|
649
648
|
static VALUE
|
@@ -748,9 +747,9 @@ MemoryOps rbffi_AbstractMemoryOps = {
|
|
748
747
|
void
|
749
748
|
rbffi_AbstractMemory_Init(VALUE moduleFFI)
|
750
749
|
{
|
751
|
-
/*
|
750
|
+
/*
|
752
751
|
* Document-class: FFI::AbstractMemory
|
753
|
-
*
|
752
|
+
*
|
754
753
|
* {AbstractMemory} is the base class for many memory management classes such as {Buffer}.
|
755
754
|
*
|
756
755
|
* This class has a lot of methods to work with integers :
|
@@ -778,8 +777,8 @@ rbffi_AbstractMemory_Init(VALUE moduleFFI)
|
|
778
777
|
*/
|
779
778
|
VALUE classMemory = rb_define_class_under(moduleFFI, "AbstractMemory", rb_cObject);
|
780
779
|
rbffi_AbstractMemoryClass = classMemory;
|
781
|
-
/*
|
782
|
-
* Document-variable: FFI::AbstractMemory
|
780
|
+
/*
|
781
|
+
* Document-variable: FFI::AbstractMemory
|
783
782
|
*/
|
784
783
|
rb_global_variable(&rbffi_AbstractMemoryClass);
|
785
784
|
rb_define_alloc_func(classMemory, memory_allocate);
|
@@ -807,13 +806,13 @@ rbffi_AbstractMemory_Init(VALUE moduleFFI)
|
|
807
806
|
rb_define_method(classMemory, "read_array_of_" #type, memory_read_array_of_##type, 1); \
|
808
807
|
rb_define_method(classMemory, "write_array_of_u" #type, memory_write_array_of_u##type, 1); \
|
809
808
|
rb_define_method(classMemory, "read_array_of_u" #type, memory_read_array_of_u##type, 1);
|
810
|
-
|
809
|
+
|
811
810
|
INT(int8);
|
812
811
|
INT(int16);
|
813
812
|
INT(int32);
|
814
813
|
INT(int64);
|
815
814
|
INT(long);
|
816
|
-
|
815
|
+
|
817
816
|
#define ALIAS(name, old) \
|
818
817
|
rb_define_alias(classMemory, "put_" #name, "put_" #old); \
|
819
818
|
rb_define_alias(classMemory, "get_" #name, "get_" #old); \
|
@@ -831,12 +830,12 @@ rbffi_AbstractMemory_Init(VALUE moduleFFI)
|
|
831
830
|
rb_define_alias(classMemory, "read_array_of_" #name, "read_array_of_" #old); \
|
832
831
|
rb_define_alias(classMemory, "write_array_of_u" #name, "write_array_of_u" #old); \
|
833
832
|
rb_define_alias(classMemory, "read_array_of_u" #name, "read_array_of_u" #old);
|
834
|
-
|
833
|
+
|
835
834
|
ALIAS(char, int8);
|
836
835
|
ALIAS(short, int16);
|
837
836
|
ALIAS(int, int32);
|
838
837
|
ALIAS(long_long, int64);
|
839
|
-
|
838
|
+
|
840
839
|
/*
|
841
840
|
* Document-method: put_float32
|
842
841
|
* call-seq: memory.put_float32offset, value)
|