tsafe 0.0.4 → 0.0.5

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

data/lib/tsafe.rb

@@ -4,7 +4,7 @@ require "monitor"
 module Tsafe
   #Autoloader for subclasses.
   def self.const_missing(name)
-    require "#{File.dirname(__FILE__)}/../include/#{name.to_s.downcase}.rb"
+    require "#{File.dirname(__FILE__)}/tsafe_#{name.to_s.downcase}.rb"
     raise "Still not loaded: '#{name}'." if !Tsafe.const_defined?(name)
     return Tsafe.const_get(name)
   end

data/{include/mrswlock.rb → lib/tsafe_mrswlock.rb}

@@ -6,20 +6,30 @@ class Tsafe::Mrswlock
   def initialize
     @reads = 0
     @w_mutex = Mutex.new
+    
+    #This variable is used to allow reads from the writing thread (monitor-behavior).
+    @locked_by = nil
+    
+    #This hash holds thread-IDs for threads that are reading.
+    @reading_threads = {}
   end
   
   # Runs the given block through the read-synchronization.
   def rsync
     begin
-      while @w_mutex.locked?
+      tid = Thread.current.__id__
+      
+      while @w_mutex.locked? and @locked_by != tid
         Thread.pass
         print "Passed because lock.\n" if @@debug
       end
       
+      @reading_threads[tid] = true
       @reads += 1
       print "Reading more than one at a time! (#{@reads})\n" if @@debug and @reads >= 2
       yield
     ensure
+      @reading_threads.delete(tid)
       @reads -= 1
     end
   end
@@ -31,13 +41,25 @@ class Tsafe::Mrswlock
   #  end
   def wsync
     @w_mutex.synchronize do
-      #Wait for any reads to finish that might have started while we were getting the lock.
-      while @reads > 0
-        Thread.pass
-        print "Passed because reading.\n" if @@debug
+      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
+          if @reading_threads.key?(tid)
+            raise ThreadError, "Deadlock: Writing is not allowed while reading."
+          end
+          
+          Thread.pass
+          print "Passed because reading.\n" if @@debug
+        end
+        
+        yield
+      ensure
+        @locked_by = nil
       end
-      
-      yield
     end
   end
   

data/spec/mrswlock_spec.rb

@@ -1,7 +1,9 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
+require "timeout"
+
 describe "Tsafe::Rwmutex" do
-  it "should work!" do
+  it "should work with the modified hash" do
     Thread.abort_on_exception = true
     debug = false
     
@@ -22,10 +24,10 @@ describe "Tsafe::Rwmutex" do
     
     ts = []
     
-    1.upto(20) do |tcount|
+    1.upto(10) do |tcount|
       print "Starting thread #{tcount}\n" if debug
       ts << Thread.new do
-        1.upto(10000) do |count|
+        1.upto(5000) do |count|
           hash[count] = count
           
           hash[count]
@@ -46,7 +48,7 @@ describe "Tsafe::Rwmutex" do
     end
   end
   
-  it "should work!" do
+  it "should work with manual lock creation" do
     debug = false
     
     hash = {}
@@ -58,9 +60,9 @@ describe "Tsafe::Rwmutex" do
     rwm = Tsafe::Mrswlock.new
     ts = []
     
-    1.upto(20) do
+    1.upto(10) do
       ts << Thread.new do
-        1.upto(10000) do |count|
+        1.upto(5000) do |count|
           rwm.wsync do
             hash[count] = count
           end
@@ -88,4 +90,51 @@ describe "Tsafe::Rwmutex" do
       t.join
     end
   end
+  
+  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|
+      hash[count] = count
+    end
+    
+    Timeout.timeout(7) do
+      ts = []
+      1.upto(5) do
+        ts << Thread.new do
+          hash.keep_if do |key, val|
+            hash.each do |key2, val2|
+              #ignore.
+            end
+            
+            if key > 500
+              true
+            else
+              false
+            end
+          end
+        end
+      end
+      
+      ts.each do |t|
+        t.join
+      end
+    end
+  end
+  
+  it "should not be able to write while reading from same thread" do
+    hash = Tsafe::MonHash.new
+    0.upto(1000) do |count|
+      hash[count] = count
+    end
+    
+    begin
+      hash.each do |key, val|
+        hash.delete(key)
+      end
+      
+      raise "Expected ThreadError but didnt get raised."
+    rescue ThreadError
+      #ignore - supposed to happen.
+    end
+  end
 end

data/tsafe.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{tsafe}
-  s.version = "0.0.4"
+  s.version = "0.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kasper Johansen"]
@@ -25,13 +25,13 @@ Gem::Specification.new do |s|
     "README.rdoc",
     "Rakefile",
     "VERSION",
-    "include/monarray.rb",
-    "include/monhash.rb",
-    "include/monitored.rb",
-    "include/mrswlock.rb",
-    "include/mutexed.rb",
-    "include/proxy.rb",
     "lib/tsafe.rb",
+    "lib/tsafe_monarray.rb",
+    "lib/tsafe_monhash.rb",
+    "lib/tsafe_monitored.rb",
+    "lib/tsafe_mrswlock.rb",
+    "lib/tsafe_mutexed.rb",
+    "lib/tsafe_proxy.rb",
     "spec/mrswlock_spec.rb",
     "spec/spec_helper.rb",
     "spec/tsafe_spec.rb",

metadata

@@ -2,7 +2,7 @@
 name: tsafe
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - Kasper Johansen
@@ -75,13 +75,13 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
-- include/monarray.rb
-- include/monhash.rb
-- include/monitored.rb
-- include/mrswlock.rb
-- include/mutexed.rb
-- include/proxy.rb
 - lib/tsafe.rb
+- lib/tsafe_monarray.rb
+- lib/tsafe_monhash.rb
+- lib/tsafe_monitored.rb
+- lib/tsafe_mrswlock.rb
+- lib/tsafe_mutexed.rb
+- lib/tsafe_proxy.rb
 - spec/mrswlock_spec.rb
 - spec/spec_helper.rb
 - spec/tsafe_spec.rb
@@ -100,7 +100,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 2392481904128949132
+      hash: -2179111406446538403
       segments: 
       - 0
       version: "0"