diff options
| author | tenderlove <tenderlove@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-02-03 01:23:48 +0000 |
|---|---|---|
| committer | tenderlove <tenderlove@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-02-03 01:23:48 +0000 |
| commit | b386fe21eca01e03a5ca447792354632e549c94e (patch) | |
| tree | 30b480ee3ab580e28053d1ec3f31a5fd5285aa9c /ext/dl/dl.c | |
| parent | b378bda47c3960acd983890efd01ac08794f6fd3 (diff) | |
| download | ruby-b386fe21eca01e03a5ca447792354632e549c94e.tar.gz | |
Wed Feb 3 10:12:09 2010 Aaron Patterson <tenderlove@ruby-lang.org>
* ext/dl/function.c: DL::Function now uses libffi
* ext/dl/cfunc.c (rb_dl_set_last_error): set to non static so errors
can be exposed.
* ext/dl/closure.c: DL::Closure will now be used in place of
ext/dl/callback/*.
* ext/dl/dl.c: legacy callbacks removed in favor of libffi
* ext/dl/dl_converions.(c,h): used for converting ruby types to FFI
types.
* ext/dl/callback/*: replaced by libffi callbacks.
* ext/dl/lib/dl/callback.rb: Converting internal callbacks to use
DL::Closure
* ext/dl/lib/dl/closure.rb: Ruby parts of the new DL::Closure object
* ext/dl/lib/dl/import.rb: More conversion to use DL::Closure object
* ext/dl/lib/dl/value.rb (ruby2ffi): adding private method for
DL::CPtr to ffi value conversion.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26545 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/dl/dl.c')
| -rw-r--r-- | ext/dl/dl.c | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/ext/dl/dl.c b/ext/dl/dl.c index 9635794883..8f8212015b 100644 --- a/ext/dl/dl.c +++ b/ext/dl/dl.c @@ -77,19 +77,6 @@ rb_dl_value2ptr(VALUE self, VALUE val) return PTR2NUM((void*)val); } -static void -rb_dl_init_callbacks(VALUE dl) -{ - static const char cb[] = "dl/callback.so"; - - rb_autoload(dl, rb_intern_const("CdeclCallbackAddrs"), cb); - rb_autoload(dl, rb_intern_const("CdeclCallbackProcs"), cb); -#ifdef FUNC_STDCALL - rb_autoload(dl, rb_intern_const("StdcallCallbackAddrs"), cb); - rb_autoload(dl, rb_intern_const("StdcallCallbackProcs"), cb); -#endif -} - void Init_dl(void) { @@ -107,8 +94,6 @@ Init_dl(void) rb_define_const(rb_mDL, "MAX_CALLBACK", INT2NUM(MAX_CALLBACK)); rb_define_const(rb_mDL, "DLSTACK_SIZE", INT2NUM(DLSTACK_SIZE)); - rb_dl_init_callbacks(rb_mDL); - rb_define_const(rb_mDL, "RTLD_GLOBAL", INT2NUM(RTLD_GLOBAL)); rb_define_const(rb_mDL, "RTLD_LAZY", INT2NUM(RTLD_LAZY)); rb_define_const(rb_mDL, "RTLD_NOW", INT2NUM(RTLD_NOW)); @@ -162,4 +147,6 @@ Init_dl(void) Init_dlhandle(); Init_dlcfunc(); Init_dlptr(); + Init_dlfunction(); + Init_dlclosure(); } |