Make sure locks are not shared on shared when objects are dup/cloned

ruby-concurrency · Jun 4, 2021 · 0ace358 · 0ace358
1 parent b57b483
commit 0ace358
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 0 deletions.
diff --git a/lib/concurrent-ruby/concurrent/synchronization/mutex_lockable_object.rb b/lib/concurrent-ruby/concurrent/synchronization/mutex_lockable_object.rb
@@ -32,6 +32,12 @@ def initialize(*defaults)
         @__Condition__ = ::ConditionVariable.new
       end
 
+      def initialize_copy(other)
+        super
+        @__Lock__      = ::Mutex.new
+        @__Condition__ = ::ConditionVariable.new
+      end
+
       protected
 
       def synchronize
@@ -61,6 +67,12 @@ def initialize(*defaults)
         @__Condition__ = @__Lock__.new_cond
       end
 
+      def initialize_copy(other)
+        super
+        @__Lock__      = ::Mutex.new
+        @__Condition__ = @__Lock__.new_cond
+      end
+
       protected
 
       def synchronize # TODO may be a problem with lock.synchronize { lock.wait }

diff --git a/lib/concurrent-ruby/concurrent/synchronization/rbx_lockable_object.rb b/lib/concurrent-ruby/concurrent/synchronization/rbx_lockable_object.rb
@@ -12,6 +12,12 @@ def initialize(*defaults)
         @__owner__   = nil
       end
 
+      def initialize_copy(other)
+        super
+        @__Waiters__ = []
+        @__owner__   = nil
+      end
+
       protected
 
       def synchronize(&block)