summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--ext/dl/lib/dl/func.rb22
-rw-r--r--test/dl/test_func.rb43
3 files changed, 71 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index fc15db7..47f2b7f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Dec 12 00:13:34 2012 Naohisa Goto <ngotogenome@gmail.com>
+
+ * ext/dl/lib/dl/func.rb (DL::Function#unbind, #bound?): suppress
+ NoMethodError when Fiddle is available. [ruby-core:50756] [Bug #7543]
+ * test/dl/test_func.rb (test_bound*, test_unbind*): tests for the above.
+
Tue Dec 11 19:38:37 2012 Naohisa Goto <ngotogenome@gmail.com>
* ext/fiddle/function.c (Fiddle::Function.new): new keyword argument
diff --git a/ext/dl/lib/dl/func.rb b/ext/dl/lib/dl/func.rb
index 434f1bc..a2e5038 100644
--- a/ext/dl/lib/dl/func.rb
+++ b/ext/dl/lib/dl/func.rb
@@ -36,6 +36,9 @@ module DL
def name
@name
end
+ def ptr
+ to_i
+ end
end
private_constant :FiddleClosureCFunc
@@ -157,6 +160,25 @@ module DL
end
def unbind()
+ if DL.fiddle? then
+ if @cfunc.kind_of?(Fiddle::Closure) and @cfunc.ptr != 0 then
+ call_type = case abi
+ when CALL_TYPE_TO_ABI[nil]
+ nil
+ when CALL_TYPE_TO_ABI[:stdcall]
+ :stdcall
+ else
+ raise(RuntimeError, "unsupported abi: #{abi}")
+ end
+ @cfunc = CFunc.new(0, @cfunc.ctype, name, call_type)
+ return 0
+ elsif @cfunc.ptr != 0 then
+ @cfunc.ptr = 0
+ return 0
+ else
+ return nil
+ end
+ end
if( @cfunc.ptr != 0 )
case @cfunc.calltype
when :cdecl
diff --git a/test/dl/test_func.rb b/test/dl/test_func.rb
index b1aac15..62e1542 100644
--- a/test/dl/test_func.rb
+++ b/test/dl/test_func.rb
@@ -15,6 +15,49 @@ module DL
assert_equal('<callback>qsort', cb.name)
end
+ def test_bound
+ f = Function.new(CFunc.new(0, TYPE_INT, 'test'), [TYPE_INT, TYPE_INT])
+ assert_equal false, f.bound?
+ begin
+ f.bind { |x,y| x + y }
+ assert_equal true, f.bound?
+ ensure
+ f.unbind # max number of callbacks is limited to MAX_CALLBACK
+ end
+ end
+
+ def test_bound_for_callback_closure
+ begin
+ f = Function.new(CFunc.new(0, TYPE_INT, 'test'),
+ [TYPE_INT, TYPE_INT]) { |x,y| x + y }
+ assert_equal true, f.bound?
+ ensure
+ f.unbind if f # max number of callbacks is limited to MAX_CALLBACK
+ end
+ end
+
+ def test_unbind
+ f = Function.new(CFunc.new(0, TYPE_INT, 'test'), [TYPE_INT, TYPE_INT])
+ begin
+ f.bind { |x, y| x + y }
+ assert_nothing_raised { f.unbind }
+ assert_equal false, f.bound?
+ # unbind() after unbind() should not raise error
+ assert_nothing_raised { f.unbind }
+ ensure
+ f.unbind # max number of callbacks is limited to MAX_CALLBACK
+ end
+ end
+
+ def test_unbind_normal_function
+ f = Function.new(CFunc.new(@libc['strcpy'], TYPE_VOIDP, 'strcpy'),
+ [TYPE_VOIDP, TYPE_VOIDP])
+ assert_nothing_raised { f.unbind }
+ assert_equal false, f.bound?
+ # unbind() after unbind() should not raise error
+ assert_nothing_raised { f.unbind }
+ end
+
def test_bind
f = Function.new(CFunc.new(0, TYPE_INT, 'test'), [TYPE_INT, TYPE_INT])
assert_nothing_raised {