tsafe 0.0.10 → 0.0.11

data/VERSION

@@ -1 +1 @@
-0.0.10
+0.0.11

data/lib/tsafe_mrswlock.rb

@@ -6,6 +6,7 @@ class Tsafe::Mrswlock
   def initialize
     @reads = 0
     @w_mutex = Mutex.new
+    @threads_read_stopped = []
     
     #This variable is used to allow reads from the writing thread (monitor-behavior).
     @locked_by = nil
@@ -17,14 +18,25 @@ class Tsafe::Mrswlock
   # Runs the given block through the read-synchronization.
   def rsync
     begin
-      tid = Thread.current.__id__
-      Thread.pass while @w_mutex.locked? and @locked_by != tid
-      @reading_threads[tid] = true
-      @reads += 1
-      yield
+      begin
+        tid = Thread.current.__id__
+        
+        while @w_mutex.locked? and @locked_by != tid
+          @threads_read_stopped << Thread.current
+          Thread.stop
+        end
+        
+        @threads_read_stopped.delete(Thread.current)
+        @reading_threads[tid] = true
+        @reads += 1
+        yield
+      ensure
+        @reading_threads.delete(tid)
+        @reads -= 1
+      end
     ensure
-      @reading_threads.delete(tid)
-      @reads -= 1
+      #Restart stopped writing-thread.
+      @threads_write_stopped.run if @threads_write_stopped and @reads <= 0
     end
   end
   
@@ -34,21 +46,30 @@ class Tsafe::Mrswlock
   #    #do something within lock.
   #  end
   def wsync
-    @w_mutex.synchronize do
-      begin
-        tid = Thread.current.__id__
-        @locked_by = tid
-        
-        #Wait for any reads to finish that might have started while we were getting the lock.
-        #Also allow write if there is only one reading thread and that reading thread is the current thread.
-        while @reads > 0
-          raise ThreadError, "Deadlock: Writing is not allowed while reading." if @reading_threads.key?(tid)
-          Thread.pass
+    begin
+      @w_mutex.synchronize do
+        begin
+          tid = Thread.current.__id__
+          @locked_by = tid
+          
+          #Wait for any reads to finish that might have started while we were getting the lock.
+          #Also allow write if there is only one reading thread and that reading thread is the current thread.
+          while @reads > 0
+            raise ThreadError, "Deadlock: Writing is not allowed while reading." if @reading_threads.key?(tid)
+            @threads_write_stopped = Thread.current
+            Thread.stop
+          end
+          
+          yield
+        ensure
+          @locked_by = nil
+          @threads_write_stopped = nil
         end
-        
-        yield
-      ensure
-        @locked_by = nil
+      end
+    ensure
+      #Restart any stopped reading-threads.
+      while thread = @threads_read_stopped.shift
+        thread.run
       end
     end
   end

data/spec/mrswlock_spec.rb

@@ -99,13 +99,13 @@ describe "Tsafe::Rwmutex" do
   
   it "should be able to read while writing from same thread while other threads are stressing" do
     hash = Tsafe::MonHash.new
-    0.upto(1000) do |count|
+    0.upto(1500) do |count|
       hash[count] = count
     end
     
-    Timeout.timeout(7) do
+    Timeout.timeout(14) do
       ts = []
-      1.upto(5) do
+      1.upto(20) do
         ts << Thread.new do
           hash.keep_if do |key, val|
             hash.each do |key2, val2|
@@ -143,4 +143,32 @@ describe "Tsafe::Rwmutex" do
       #ignore - supposed to happen.
     end
   end
+  
+  it "should include thread-safe array" do
+    arr = Tsafe::MonArray.new
+    0.upto(1000) do |count|
+      arr << count
+    end
+    
+    ts = []
+    0.upto(20) do
+      ts << Thread.new do
+        arr.each do |i|
+          something = i + 100 / 5
+        end
+        
+        0.upto(1000) do |count|
+          arr << count + 1000
+        end
+        
+        arr.delete_if do |count|
+          count > 1000
+        end
+      end
+    end
+    
+    ts.each do |t|
+      t.join
+    end
+  end
 end

data/tsafe.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{tsafe}
-  s.version = "0.0.10"
+  s.version = "0.0.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kasper Johansen"]

metadata

@@ -2,7 +2,7 @@
 name: tsafe
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors: 
 - Kasper Johansen
@@ -102,7 +102,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 1945930080494569977
+      hash: -1620018328020202062
       segments: 
       - 0
       version: "0"