diff options
author | tenderlove <tenderlove@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-11-27 01:38:41 +0000 |
---|---|---|
committer | tenderlove <tenderlove@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-11-27 01:38:41 +0000 |
commit | ab2a7a9346038c4d47dcac030611834cde06a62d (patch) | |
tree | e588c360d963553a45f01146e1720b77c1df4ebf /ext/fiddle/lib | |
parent | 357d42569fc99c9eb6482484dab8a72cd35c57da (diff) | |
download | ruby-ab2a7a9346038c4d47dcac030611834cde06a62d.tar.gz |
* ext/fiddle/handle.c: Make Fiddle independent of DL, copy DL::Handle
to Fiddle::Handle.
* ext/fiddle/pointer.c: Make Fiddle independent of DL, copy
DL::Pointer to Fiddle::Pointer.
* test/fiddle/test_func.rb: relevent tests
* test/fiddle/test_handle.rb: ditto
* test/fiddle/test_pointer.rb: ditto
* ext/dl/lib/dl/struct.rb: use Fiddle::Pointer if available
* ext/fiddle/extconf.rb: check for dlfcn.h
* ext/fiddle/fiddle.c: add constants for sizeof() things
* ext/fiddle/fiddle.h: include dlfcn.h
* ext/fiddle/function.c: expose a C function for creating new
Fiddle::Function objects.
* ext/fiddle/lib/fiddle.rb: include constants for dl backwards compat
* ext/fiddle/lib/fiddle/function.rb: read the pointer from the
function for dl backwards compat.
* test/dl/test_callback.rb: check the addresses of the pointers rather
than their types.
* test/fiddle/helper.rb: remove dependency on dl
* test/fiddle/test_closure.rb: ditto
* test/fiddle/test_fiddle.rb: ditto
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37881 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/fiddle/lib')
-rw-r--r-- | ext/fiddle/lib/fiddle.rb | 16 | ||||
-rw-r--r-- | ext/fiddle/lib/fiddle/function.rb | 7 |
2 files changed, 18 insertions, 5 deletions
diff --git a/ext/fiddle/lib/fiddle.rb b/ext/fiddle/lib/fiddle.rb index 7d55a1f7ad..1c68b7b0ec 100644 --- a/ext/fiddle/lib/fiddle.rb +++ b/ext/fiddle/lib/fiddle.rb @@ -1,13 +1,8 @@ require 'fiddle.so' require 'fiddle/function' require 'fiddle/closure' -require 'dl' unless Object.const_defined?(:DL) module Fiddle - - # A reference to DL::CPtr - Pointer = DL::CPtr - if WINDOWS # Returns the last win32 +Error+ of the current executing +Thread+ or nil # if none @@ -31,4 +26,15 @@ module Fiddle Thread.current[:__DL2_LAST_ERROR__] = error Thread.current[:__FIDDLE_LAST_ERROR__] = error end + + def dlopen library + Fiddle::Handle.new library + end + module_function :dlopen + + # Add constants for backwards compat + + RTLD_GLOBAL = Handle::RTLD_GLOBAL # :nodoc: + RTLD_LAZY = Handle::RTLD_LAZY # :nodoc: + RTLD_NOW = Handle::RTLD_NOW # :nodoc: end diff --git a/ext/fiddle/lib/fiddle/function.rb b/ext/fiddle/lib/fiddle/function.rb index 1657682498..f4d41e6a82 100644 --- a/ext/fiddle/lib/fiddle/function.rb +++ b/ext/fiddle/lib/fiddle/function.rb @@ -2,5 +2,12 @@ module Fiddle class Function # The ABI of the Function. attr_reader :abi + + # The address of this function + attr_reader :ptr + + def to_i + ptr.to_i + end end end |