1 files changed, 55 insertions, 28 deletions
diff --git a/ext/dl/lib/dl/callback.rb b/ext/dl/lib/dl/callback.rb
index c8daaf6322..0863c70d4d 100644
--- a/ext/dl/lib/dl/callback.rb
+++ b/ext/dl/lib/dl/callback.rb
@@ -4,22 +4,38 @@ require 'thread'
 module DL
   SEM = Mutex.new
 
-  def set_callback_internal(proc_entry, addr_entry, argc, ty, &cbp)
+  if DL.fiddle?
+    CdeclCallbackProcs = {}
+    CdeclCallbackAddrs = {}
+    StdcallCallbackProcs = {}
+    StdcallCallbackAddrs = {}
+  end
+
+  def set_callback_internal(proc_entry, addr_entry, argc, ty, abi = nil, &cbp)
     if( argc < 0 )
       raise(ArgumentError, "arity should not be less than 0.")
     end
     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
+
+    if DL.fiddle?
+      abi ||= Fiddle::Function::DEFAULT
+      closure = Fiddle::Closure::BlockCaller.new(ty, [TYPE_VOIDP] * argc, abi, &cbp)
+      proc_entry[closure.to_i] = closure
+      addr = closure.to_i
+    else
+      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
+        }
       }
-    }
+    end
+
     addr
   end
 
@@ -28,31 +44,42 @@ module DL
   end
 
   def set_stdcall_callback(ty, argc, &cbp)
-    set_callback_internal(StdcallCallbackProcs, StdcallCallbackAddrs, argc, ty, &cbp)
+    if DL.fiddle?
+      set_callback_internal(StdcallCallbackProcs, StdcallCallbackAddrs, argc, ty, Fiddle::Function::STDCALL, &cbp)
+    else
+      set_callback_internal(StdcallCallbackProcs, StdcallCallbackAddrs, argc, ty, &cbp)
+    end
   end
 
   def remove_callback_internal(proc_entry, addr_entry, addr, ctype = nil)
-    index = nil
-    if( ctype )
-      addr_entry[ctype].each_with_index{|xaddr, idx|
-        if( xaddr == addr )
-          index = idx
-        end
-      }
+    if DL.fiddle?
+      addr = addr.to_i
+      return false unless proc_entry.key?(addr)
+      proc_entry.delete(addr)
+      true
     else
-      addr_entry.each{|ty,entry|
-        entry.each_with_index{|xaddr, idx|
+      index = nil
+      if( ctype )
+        addr_entry[ctype].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
+      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
   end