1 files changed, 37 insertions, 14 deletions
diff --git a/ext/dl/lib/dl/callback.rb b/ext/dl/lib/dl/callback.rb
index 53da888d9d..c8daaf6322 100644
--- a/ext/dl/lib/dl/callback.rb
+++ b/ext/dl/lib/dl/callback.rb
@@ -1,21 +1,26 @@
 require 'dl'
-require 'dl/closure'
 require 'thread'
 
 module DL
   SEM = Mutex.new
 
-  CdeclCallbackProcs = {}
-  CdeclCallbackAddrs = {}
-
-  def set_callback_internal(proc_entry, addr_entry, argc, ty, abi = DL::Function::DEFAULT, &cbp)
+  def set_callback_internal(proc_entry, addr_entry, argc, ty, &cbp)
     if( argc < 0 )
       raise(ArgumentError, "arity should not be less than 0.")
     end
-
-    closure = DL::Closure::BlockCaller.new(ty, [TYPE_VOIDP] * argc, abi, &cbp)
-    proc_entry[closure.to_i] = closure
-    closure.to_i
+    addr = nil
+    SEM.synchronize{
+      ary = proc_entry[ty]
+      (0...MAX_CALLBACK).each{|n|
+        idx = (n * DLSTACK_SIZE) + argc
+        if( ary[idx].nil? )
+          ary[idx] = cbp
+          addr = addr_entry[ty][idx]
+          break
+        end
+      }
+    }
+    addr
   end
 
   def set_cdecl_callback(ty, argc, &cbp)
@@ -23,14 +28,32 @@ module DL
   end
 
   def set_stdcall_callback(ty, argc, &cbp)
-    set_callback_internal(StdcallCallbackProcs, StdcallCallbackAddrs, argc, ty, DL::Function::STDCALL, &cbp)
+    set_callback_internal(StdcallCallbackProcs, StdcallCallbackAddrs, argc, ty, &cbp)
   end
 
   def remove_callback_internal(proc_entry, addr_entry, addr, ctype = nil)
-    addr = addr.to_i
-    return false unless proc_entry.key?(addr)
-    proc_entry.delete(addr)
-    true
+    index = nil
+    if( ctype )
+      addr_entry[ctype].each_with_index{|xaddr, idx|
+        if( xaddr == addr )
+          index = idx
+        end
+      }
+    else
+      addr_entry.each{|ty,entry|
+        entry.each_with_index{|xaddr, idx|
+          if( xaddr == addr )
+            index = idx
+          end
+        }
+      }
+    end
+    if( index and proc_entry[ctype][index] )
+      proc_entry[ctype][index] = nil
+      return true
+    else
+      return false
+    end
   end
 
   def remove_cdecl_callback(addr, ctype = nil)