Merge pull request #31 from ruby-concurrency/ensure-thread-safety

Ensure thread-safety

Author: lucasallan

lib/ref/abstract_reference_key_map.rb

@@ -28,8 +28,10 @@ def initialize
     # Get a value from the map by key. If the value has been reclaimed by the garbage
     # collector, this will return nil.
     def [](key)
-      rkey = ref_key(key)
-      @values[rkey] if rkey
+      @lock.synchronize do
+        rkey = ref_key(key)
+        @values[rkey] if rkey
+      end
     end
 
     alias_method :get, :[]
@@ -47,12 +49,14 @@ def []=(key, value)
 
     # Remove the value associated with the key from the map.
     def delete(key)
-      rkey = ref_key(key)
-      if rkey
-        @references_to_keys_map.delete(rkey)
-        @values.delete(rkey)
-      else
-        nil
+      @lock.synchronize do
+        rkey = ref_key(key)
+        if rkey
+          @references_to_keys_map.delete(rkey)
+          @values.delete(rkey)
+        else
+          nil
+        end
       end
     end
 
@@ -87,8 +91,8 @@ def clear
 
     # Merge the values from another hash into this map.
     def merge!(other_hash)
-      other_hash.each do |key, value|
-        self[key] = value
+      @lock.synchronize do
+        other_hash.each { |key, value| self[key] = value }
       end
     end
 
@@ -106,7 +110,6 @@ def empty?
       @references_to_keys_map.each do |_, ref|
         return false if ref.object
       end
-
       true
     end
 

lib/ref/abstract_reference_value_map.rb

@@ -28,9 +28,11 @@ def initialize
     # Get a value from the map by key. If the value has been reclaimed by the garbage
     # collector, this will return nil.
     def [](key)
-      ref = @references[key]
-      value = ref.object if ref
-      value
+      @lock.synchronize do
+        ref = @references[key]
+        value = ref.object if ref
+        value
+      end
     end
 
     alias_method :get, :[]
@@ -101,8 +103,8 @@ def clear
 
     # Merge the values from another hash into this map.
     def merge!(other_hash)
-      other_hash.each do |key, value|
-        self[key] = value
+      @lock.synchronize do
+        other_hash.each { |key, value| self[key] = value }
       end
     end