Merge pull request #21 from ruby-concurrency/replaces-safe-monitor-with-monitor

Replaces SafeMonitor with Ruby's Monitor

Author: lucasallan

lib/ref.rb

@@ -3,7 +3,6 @@ module Ref
 require'ref/abstract_reference_key_map'
 require'ref/reference'
 require'ref/reference_queue'
-require'ref/safe_monitor'
 
 # Set the best implementation for weak references based on the runtime.
 ifdefined?(RUBY_PLATFORM) && RUBY_PLATFORM == 'java'

lib/ref/abstract_reference_key_map.rb

@@ -9,19 +9,19 @@ class << self
 defreference_class=(klass)#:nodoc:
 @reference_class=klass
 end
-
+
 defreference_class#:nodoc:
 raiseNotImplementedError.new("#{name} is an abstract class and cannot be instantiated")unless@reference_class
 @reference_class
 end
 end
-
+
 # Create a new map. Values added to the hash will be cleaned up by the garbage
 # collector if there are no other reference except in the map.
 definitialize
 @values={}
 @references_to_keys_map={}
-@lock=SafeMonitor.new
+@lock=Monitor.new
 @reference_cleanup=lambda{|object_id| remove_reference_to(object_id)}
 end
 
@@ -60,14 +60,14 @@ def delete(key)
 defkeys
 @values.keys.collect{|rkey| @references_to_keys_map[rkey].object}.compact
 end
-
+
 # Turn the map into an arry of [key, value] entries.
 defto_a
 array=[]
 each{|k,v| array << [k,v]}
 array
 end
-
+
 # Iterate through all the key/value pairs in the map that have not been reclaimed
 # by the garbage collector.
 defeach
@@ -128,7 +128,7 @@ def ref_key (key)
 nil
 end
 end
-
+
 defremove_reference_to(object_id)
 @lock.synchronizedo
 @references_to_keys_map.delete(object_id)

lib/ref/abstract_reference_value_map.rb

@@ -9,19 +9,19 @@ class << self
 defreference_class=(klass)#:nodoc:
 @reference_class=klass
 end
-
+
 defreference_class#:nodoc:
 raiseNotImplementedError.new("#{name} is an abstract class and cannot be instantiated")unless@reference_class
 @reference_class
 end
 end
-
+
 # Create a new map. Values added to the map will be cleaned up by the garbage
 # collector if there are no other reference except in the map.
 definitialize
 @references={}
 @references_to_keys_map={}
-@lock=SafeMonitor.new
+@lock=Monitor.new
 @reference_cleanup=lambda{|object_id| remove_reference_to(object_id)}
 end
 
@@ -74,14 +74,14 @@ def values
 each{|k,v| vals << v}
 vals
 end
-
+
 # Turn the map into an arry of [key, value] entries
 defto_a
 array=[]
 each{|k,v| array << [k,v]}
 array
 end
-
+
 # Iterate through all the key/value pairs in the map that have not been reclaimed
 # by the garbage collector.
 defeach

lib/ref/reference_queue.rb

@@ -18,7 +18,7 @@ module Ref
 # # Do something...
 # end
 # end
-#
+#
 # queue = Ref::ReferenceQueue.new
 # ref = MyRef.new(Object.new)
 # queue.monitor(ref)
@@ -30,15 +30,15 @@ class ReferenceQueue
 definitialize
 @queue=[]
 @references={}
-@lock=SafeMonitor.new
+@lock=Monitor.new
 @finalizer=lambdado |object_id|
 @lock.synchronizedo
 ref=@references.delete(object_id)
 @queue.push(ref)ifref
 end
 end
 end
-
+
 # Monitor a reference. When the object the reference points to is garbage collected,
 # the reference will be added to the queue.
 defmonitor(reference)
@@ -52,7 +52,7 @@ def monitor(reference)
 push(reference)
 end
 end
-
+
 # Add a reference to the queue.
 defpush(reference)
 ifreference
@@ -61,26 +61,26 @@ def push(reference)
 end
 end
 end
-
+
 # Pull the last reference off the queue. Returns +nil+ if their are no references.
 defpop
 @lock.synchronizedo
 @queue.pop
 end
 end
-
+
 # Pull the next reference off the queue. Returns +nil+ if there are no references.
 defshift
 @lock.synchronizedo
 @queue.shift
 end
 end
-
+
 # Return +true+ if the queue is empty.
 defempty?
 @queue.empty?
 end
-
+
 # Get the current size of the queue.
 defsize
 @queue.size

lib/ref/safe_monitor.rb

@@ -19,12 +19,12 @@ module Ref
 classSoftReference < Reference
 @@strong_references=[{}]
 @@gc_flag_set=false
-
+
 # Number of garbage collection cycles after an object is used before a reference to it can be reclaimed.
 MIN_GC_CYCLES=10
-
-@@lock=SafeMonitor.new
-
+
+@@lock=Monitor.new
+
 @@finalizer=lambdado |object_id|
 @@lock.synchronizedo
 while@@strong_references.size >= MIN_GC_CYCLESdo
@@ -34,14 +34,14 @@ class SoftReference < Reference
 @@gc_flag_set=false
 end
 end
-
+
 # Create a new soft reference to an object.
 definitialize(obj)
 @referenced_object_id=obj.__id__
 @weak_reference=WeakReference.new(obj)
 add_strong_reference(obj)
 end
-
+
 # Get the referenced object. If the object has been reclaimed by the
 # garbage collector, then this will return nil.
 defobject
@@ -50,7 +50,7 @@ def object
 add_strong_reference(obj)ifobj
 obj
 end
-
+
 private
 # Create a strong reference to the object. This reference will live
 # for three passes of the garbage collector.

lib/ref/soft_reference.rb

@@ -4,33 +4,33 @@ module Ref
 # subclass Delegator which is very heavy to instantiate and utilizes a
 # because it does not fair amount of memory under Ruby 1.8.
 classWeakReference < Reference
-
+
 classReferencePointer
 definitialize(object)
 @referenced_object_id=object.__id__
 add_backreference(object)
 end
-
+
 defcleanup
 obj=ObjectSpace._id2ref(@referenced_object_id)rescuenil
 remove_backreference(obj)ifobj
 end
-
+
 defobject
 obj=ObjectSpace._id2ref(@referenced_object_id)
 objifverify_backreferences(obj)
 rescueRangeError
 nil
 end
-
+
 private
 # Verify that the object is the same one originally set for the weak reference.
 defverify_backreferences(obj)#:nodoc:
 returnnilunlesssupports_backreference?(obj)
 backreferences=obj.instance_variable_get(:@__weak_backreferences__)ifobj.instance_variable_defined?(:@__weak_backreferences__)
 backreferences && backreferences.include?(object_id)
 end
-
+
 # Add a backreference to the object.
 defadd_backreference(obj)#:nodoc:
 returnunlesssupports_backreference?(obj)
@@ -41,7 +41,7 @@ def add_backreference(obj) #:nodoc:
 end
 backreferences << object_id
 end
-
+
 # Remove backreferences from the object.
 defremove_backreference(obj)#:nodoc:
 returnunlesssupports_backreference?(obj)
@@ -51,16 +51,16 @@ def remove_backreference(obj) #:nodoc:
 obj.send(:remove_instance_variable,:@__weak_backreferences__)ifbackreferences.empty?
 end
 end
-
+
 defsupports_backreference?(obj)
 obj.respond_to?(:instance_variable_get) && obj.respond_to?(:instance_variable_defined?)
 rescueNoMethodError
 false
 end
 end
-
+
 @@weak_references={}
-@@lock=SafeMonitor.new
+@@lock=Monitor.new
 
 # Finalizer that cleans up weak references when references are destroyed.
 @@reference_finalizer=lambdado |object_id|