diff options
| author | Yusuke Endoh <mame@ruby-lang.org> | 2020-03-04 17:28:21 +0900 |
|---|---|---|
| committer | Yusuke Endoh <mame@ruby-lang.org> | 2020-03-04 17:28:21 +0900 |
| commit | d732bc51bdbfe7d66038731d42e01a511d13b5f8 (patch) | |
| tree | 7c48fe81275de3106bd9512b187ecf49a1eb9d54 /ext/fiddle/closure.c | |
| parent | 87f6154bb4c67ca77ee353bb1fe25a922036c0e5 (diff) | |
| download | ruby-d732bc51bdbfe7d66038731d42e01a511d13b5f8.tar.gz | |
Revert "Revert "Revert "[ruby/fiddle] Use ffi_closure_free by default. (#20)"""
This reverts commit 87f6154bb4c67ca77ee353bb1fe25a922036c0e5.
It turned out that the change fails to build on macOS
https://rubyci.org/logs/rubyci.s3.amazonaws.com/osx1014/ruby-master/log/20200304T074503Z.fail.html.gz
```
+ make 'TESTS=--hide-skip -v fiddle' RUBYOPT=-w test-all
dyld: lazy symbol binding failed: Symbol not found: _ffi_closure_alloc
Referenced from: /Users/hsbt/Documents/cb/tmp/build/20200304T074503Z/ruby/.ext/x86_64-darwin18/fiddle.bundle
Expected in: flat namespace
dyld: Symbol not found: _ffi_closure_alloc
Referenced from: /Users/hsbt/Documents/cb/tmp/build/20200304T074503Z/ruby/.ext/x86_64-darwin18/fiddle.bundle
Expected in: flat namespace
make: *** [yes-test-all] Abort trap: 6
```
Diffstat (limited to 'ext/fiddle/closure.c')
| -rw-r--r-- | ext/fiddle/closure.c | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/ext/fiddle/closure.c b/ext/fiddle/closure.c index b997e23f45..1a80b2b02a 100644 --- a/ext/fiddle/closure.c +++ b/ext/fiddle/closure.c @@ -13,11 +13,25 @@ typedef struct { ffi_type **argv; } fiddle_closure; +#if defined(USE_FFI_CLOSURE_ALLOC) +#elif defined(__OpenBSD__) || defined(__APPLE__) || defined(__linux__) +# define USE_FFI_CLOSURE_ALLOC 0 +#elif defined(RUBY_LIBFFI_MODVERSION) && RUBY_LIBFFI_MODVERSION < 3000005 && \ + (defined(__i386__) || defined(__x86_64__) || defined(_M_IX86) || defined(_M_AMD64)) +# define USE_FFI_CLOSURE_ALLOC 0 +#else +# define USE_FFI_CLOSURE_ALLOC 1 +#endif + static void dealloc(void * ptr) { fiddle_closure * cls = (fiddle_closure *)ptr; +#if USE_FFI_CLOSURE_ALLOC ffi_closure_free(cls->pcl); +#else + munmap(cls->pcl, sizeof(*cls->pcl)); +#endif if (cls->argv) xfree(cls->argv); xfree(cls); } @@ -191,7 +205,12 @@ allocate(VALUE klass) VALUE i = TypedData_Make_Struct(klass, fiddle_closure, &closure_data_type, closure); +#if USE_FFI_CLOSURE_ALLOC closure->pcl = ffi_closure_alloc(sizeof(ffi_closure), &closure->code); +#else + closure->pcl = mmap(NULL, sizeof(ffi_closure), PROT_READ | PROT_WRITE, + MAP_ANON | MAP_PRIVATE, -1, 0); +#endif return i; } @@ -238,8 +257,17 @@ initialize(int rbargc, VALUE argv[], VALUE self) if (FFI_OK != result) rb_raise(rb_eRuntimeError, "error prepping CIF %d", result); +#if USE_FFI_CLOSURE_ALLOC result = ffi_prep_closure_loc(pcl, cif, callback, (void *)self, cl->code); +#else + result = ffi_prep_closure(pcl, cif, callback, (void *)self); + cl->code = (void *)pcl; + i = mprotect(pcl, sizeof(*pcl), PROT_READ | PROT_EXEC); + if (i) { + rb_sys_fail("mprotect"); + } +#endif if (FFI_OK != result) rb_raise(rb_eRuntimeError, "error prepping closure %d", result); |