1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "[ruby/fiddle] Use ffi_closure_free by default. (#20)"

Browse Source 
This reverts commit ce6caade7c57a505f73086ccd7b33c14f7715f22.
This commit is contained in:
Hiroshi SHIBATA 2019-10-24 19:52:54 +09:00 committed by SHIBATA Hiroshi
parent f126d80b1e
commit efd641ffab
Notes: git 2019-10-24 20:58:57 +09:00 
Merged: https://github.com/ruby/ruby/pull/2603
2 changed files with 42 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
ext/fiddle/closure.c
View File

@ -13,11 +13,25 @@ typedef struct {
ffi_type **argv; ffi_type **argv;
} fiddle_closure; } 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 static void
dealloc(void * ptr) dealloc(void * ptr)
{ {
fiddle_closure * cls = (fiddle_closure *)ptr; fiddle_closure * cls = (fiddle_closure *)ptr;
#if USE_FFI_CLOSURE_ALLOC
ffi_closure_free(cls->pcl); ffi_closure_free(cls->pcl);
#else
munmap(cls->pcl, sizeof(*cls->pcl));
#endif
if (cls->argv) xfree(cls->argv); if (cls->argv) xfree(cls->argv);
xfree(cls); xfree(cls);
} }
@ -191,7 +205,12 @@ allocate(VALUE klass)
VALUE i = TypedData_Make_Struct(klass, fiddle_closure, VALUE i = TypedData_Make_Struct(klass, fiddle_closure,
&closure_data_type, closure); &closure_data_type, closure);
#if USE_FFI_CLOSURE_ALLOC
closure->pcl = ffi_closure_alloc(sizeof(ffi_closure), &closure->code); 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; return i;
} }
@ -238,8 +257,17 @@ initialize(int rbargc, VALUE argv[], VALUE self)
if (FFI_OK != result) if (FFI_OK != result)
rb_raise(rb_eRuntimeError, "error prepping CIF %d", result); rb_raise(rb_eRuntimeError, "error prepping CIF %d", result);
#if USE_FFI_CLOSURE_ALLOC
result = ffi_prep_closure_loc(pcl, cif, callback, result = ffi_prep_closure_loc(pcl, cif, callback,
(void *)self, cl->code); (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) if (FFI_OK != result)
rb_raise(rb_eRuntimeError, "error prepping closure %d", result); rb_raise(rb_eRuntimeError, "error prepping closure %d", result);

20
ext/fiddle/extconf.rb
View File

@ -7,7 +7,8 @@ bundle = enable_config('bundled-libffi')
if ! bundle if ! bundle
dir_config 'libffi' dir_config 'libffi'
pkg_config("libffi") pkg_config("libffi") and
ver = pkg_config("libffi", "modversion")
if have_header(ffi_header = 'ffi.h') if have_header(ffi_header = 'ffi.h')
true true
@ -27,20 +28,20 @@ begin
Dir.glob("#{$srcdir}/libffi-*/").each{|dir| FileUtils.rm_rf(dir)} Dir.glob("#{$srcdir}/libffi-*/").each{|dir| FileUtils.rm_rf(dir)}
extlibs.run(["--cache=#{cache_dir}", ext_dir]) extlibs.run(["--cache=#{cache_dir}", ext_dir])
end end
libffi_dir = bundle != false && ver = bundle != false &&
Dir.glob("#{$srcdir}/libffi-*/") Dir.glob("#{$srcdir}/libffi-*/")
.map {|n| File.basename(n)} .map {|n| File.basename(n)}
.max_by {|n| n.scan(/\d+/).map(&:to_i)} .max_by {|n| n.scan(/\d+/).map(&:to_i)}
unless libffi_dir unless ver
raise "missing libffi. Please install libffi." raise "missing libffi. Please install libffi."
end end
srcdir = "#{$srcdir}/#{libffi_dir}" srcdir = "#{$srcdir}/#{ver}"
ffi_header = 'ffi.h' ffi_header = 'ffi.h'
libffi = Struct.new(*%I[dir srcdir builddir include lib a cflags ldflags opt arch]).new libffi = Struct.new(*%I[dir srcdir builddir include lib a cflags ldflags opt arch]).new
libffi.dir = libffi_dir libffi.dir = ver
if $srcdir == "." if $srcdir == "."
libffi.builddir = "#{libffi_dir}/#{RUBY_PLATFORM}" libffi.builddir = "#{ver}/#{RUBY_PLATFORM}"
libffi.srcdir = "." libffi.srcdir = "."
else else
libffi.builddir = libffi.dir libffi.builddir = libffi.dir
@ -51,6 +52,7 @@ begin
libffi.a = "#{libffi.lib}/libffi_convenience.#{$LIBEXT}" libffi.a = "#{libffi.lib}/libffi_convenience.#{$LIBEXT}"
nowarn = CONFIG.merge("warnflags"=>"") nowarn = CONFIG.merge("warnflags"=>"")
libffi.cflags = RbConfig.expand("$(CFLAGS)".dup, nowarn) libffi.cflags = RbConfig.expand("$(CFLAGS)".dup, nowarn)
ver = ver[/libffi-(.*)/, 1]
FileUtils.mkdir_p(libffi.dir) FileUtils.mkdir_p(libffi.dir)
libffi.opt = CONFIG['configure_args'][/'(-C)'/, 1] libffi.opt = CONFIG['configure_args'][/'(-C)'/, 1]
@ -110,6 +112,12 @@ begin
$INCFLAGS << " -I" << libffi.include $INCFLAGS << " -I" << libffi.include
end end
if ver
ver = ver.gsub(/-rc\d+/, '') # If ver contains rc version, just ignored.
ver = (ver.split('.') + [0,0])[0,3]
$defs.push(%{-DRUBY_LIBFFI_MODVERSION=#{ '%d%03d%03d' % ver }})
end
have_header 'sys/mman.h' have_header 'sys/mman.h'
if have_header "dlfcn.h" if have_header "dlfcn.h"