Try to get specs to pass.

Author: ioquatix

spec/concurrent/atomic/reentrant_read_write_lock_spec.rb

@@ -14,7 +14,67 @@
   module Concurrent
 
     BaseMatcher = RSpec::Matchers::BuiltIn::BaseMatcher
-    RRWL = ReentrantReadWriteLock # no way I'm typing that 50 times
+    # RRWL = ReentrantReadWriteLock # no way I'm typing that 50 times
+
+    class RRWL < ReentrantReadWriteLock 
+      def initialize
+        super
+        
+        @read_acquired = Concurrent::Set.new
+        @write_acquired = Concurrent::Set.new
+      end
+
+      attr :read_acquired
+      attr :write_acquired
+
+      def try_read_lock
+        if super
+          @read_acquired.add(Thread.current)
+          true
+        else
+          false
+        end
+      end
+
+      def try_write_lock
+        if super
+          @write_acquired.add(Thread.current)
+          true
+        else
+          false
+        end
+      end
+
+      def acquire_read_lock
+        if super
+          @read_acquired.add(Thread.current)
+          true
+        else
+          false
+        end
+      end
+
+      def acquire_write_lock
+        if super
+          @write_acquired.add(Thread.current)
+          true
+        else
+          false
+        end
+      end
+
+      def release_read_lock
+        super.tap do
+          @read_acquired.delete(Thread.current)
+        end
+      end
+
+      def release_write_lock
+        super.tap do
+          @write_acquired.delete(Thread.current)
+        end
+      end
+    end
 
     # ****************************************************************
     # First some custom matchers to make our tests all nice and pretty
@@ -40,15 +100,13 @@ def for_both
 
     class HoldReadLock < BaseMatcher
       def match(lock, thread)
-        ((lock.instance_eval { @Counter.value } & RRWL::MAX_READERS) != 0) &&
-          ((lock.instance_eval { @HeldCount.send(:value_for, thread) } & RRWL::READ_LOCK_MASK) > 0)
+        ((lock.instance_eval { @Counter.value } & RRWL::MAX_READERS) != 0) && lock.read_acquired.include?(thread)
       end
     end
 
     class HoldWriteLock < BaseMatcher
       def match(lock, thread)
-        ((lock.instance_eval { @Counter.value } & RRWL::RUNNING_WRITER) != 0) &&
-          ((lock.instance_eval { @HeldCount.send(:value_for, thread) } & RRWL::WRITE_LOCK_MASK) > 0)
+        ((lock.instance_eval { @Counter.value } & RRWL::RUNNING_WRITER) != 0) && lock.write_acquired.include?(thread)
       end
     end