splib 1.2 → 1.3

data/CHANGELOG

@@ -1,3 +1,5 @@
+1.3
+    * Add simple monitor
 1.2
     * Added Array#fixed_flatten for pre 1.9 versions
     * Remove IO.binread from CodeReloader for pre 1.9 versions

data/lib/splib.rb

@@ -5,6 +5,7 @@ module Splib
             :Conversions,
             :Exec,
             :HumanIdealRandomIterator,
+            :Monitor,
             :PriorityQueue,
             :UrlShorteners
            ]

data/lib/splib/Monitor.rb

@@ -0,0 +1,86 @@
+require 'thread'
+
+module Splib
+    
+    class Monitor
+        def initialize
+            @threads = []
+            @locks = []
+            @lock_owner = nil
+        end
+        # timeout:: Wait for given amount of time
+        # Park a thread here
+        def wait(timeout=nil)
+            @threads << Thread.current
+            Thread.stop
+            true
+        end
+        # Park thread while block is true
+        def wait_while
+            while yield
+                wait
+            end
+        end
+        # Park thread until block is true
+        def wait_until
+            until yield
+                wait
+            end
+        end
+        # Wake up earliest thread
+        def signal
+            lock
+            t = @threads.shift
+            t.wakeup if t.alive?
+            unlock
+        end
+        # Wake up all threads
+        def broadcast
+            lock
+            @threads.each do |t|
+                t.wakeup if t.alive?
+            end
+            @threads.clear
+            unlock
+        end
+        # Number of threads waiting
+        def waiters
+            @threads.size
+        end
+        # Lock the monitor
+        def lock
+            stop = false
+            Thread.exclusive do
+                unless(@locks.empty?)
+                    @locks << Thread.current
+                    stop = true
+                else
+                    @lock_owner = Thread.current
+                end
+            end
+            Thread.stop if stop
+        end
+        # Unlock the monitor
+        def unlock
+            unless(@lock_owner == Thread.current)
+                raise ThreadError.new("Not owner attepmting to unlock monitor")
+            else
+                Thread.exclusive do
+                    unless(@locks.empty?)
+                        @locks.delete{|t|!t.alive?}
+                        @lock_owner = @locks.shift
+                        @lock_owner.wakeup
+                    else
+                        @lock_owner = nil
+                    end
+                end
+            end 
+        end
+        # Lock the monitor, execute block and unlock the monitor
+        def synchronize
+            lock
+            yield
+            unlock
+        end
+    end
+end

data/splib.gemspec

@@ -2,7 +2,7 @@ spec = Gem::Specification.new do |s|
     s.name              = 'splib'
     s.author            = 'spox'
     s.email             = 'spox@modspox.com'
-    s.version           = '1.2'
+    s.version           = '1.3'
     s.summary           = 'Spox Library'
     s.platform          = Gem::Platform::RUBY
     s.files             = Dir['**/*']

data/tests/cases/Monitor.rb

@@ -0,0 +1,132 @@
+require 'splib'
+require 'test/unit'
+
+class MonitorTest < Test::Unit::TestCase
+    def setup
+        Splib.load :Monitor
+        @monitor = Splib::Monitor.new
+    end
+
+    def test_wait
+        t = []
+        5.times{ t << Thread.new{ @monitor.wait } }
+        sleep(0.01) # give threads a chance to wait
+        t.each do |thread|
+            assert(thread.alive?)
+            assert(thread.stop?)
+        end
+    end
+
+    def test_signal
+        output = []
+        t = []
+        5.times{ t << Thread.new{ @monitor.wait; output << 1 } }
+        sleep(0.01)
+        t.each do |thread|
+            assert(thread.alive?)
+            assert(thread.stop?)
+        end
+        assert(output.empty?)
+        @monitor.signal
+        sleep(0.01)
+        assert_equal(4, t.select{|th|th.alive?}.size)
+        assert_equal(1, output.size)
+        assert_equal(1, output.pop)
+    end
+
+    def test_broadcast
+        output = []
+        t = []
+        5.times{ t << Thread.new{ @monitor.wait; output << 1 } }
+        sleep(0.01)
+        t.each do |thread|
+            assert(thread.alive?)
+            assert(thread.stop?)
+        end
+        assert(output.empty?)
+        @monitor.broadcast
+        sleep(0.01)
+        assert_equal(5, output.size)
+        5.times{ assert_equal(1, output.pop) }
+        assert_equal(5, t.select{|th|!th.alive?}.size)
+    end
+
+    def test_wait_while
+        stop = true
+        t = Thread.new{ @monitor.wait_while{ stop } }
+        sleep(0.01)
+        assert(t.alive?)
+        assert(t.stop?)
+        @monitor.signal
+        sleep(0.01)
+        assert(t.alive?)
+        assert(t.stop?)
+        @monitor.broadcast
+        sleep(0.01)
+        assert(t.alive?)
+        assert(t.stop?)
+        stop = false
+        @monitor.signal
+        sleep(0.01)
+        assert(!t.alive?)
+        assert(t.stop?)
+    end
+
+    def test_wait_until
+        stop = false
+        t = Thread.new{ @monitor.wait_until{ stop } }
+        sleep(0.01)
+        assert(t.alive?)
+        assert(t.stop?)
+        @monitor.signal
+        sleep(0.01)
+        assert(t.alive?)
+        assert(t.stop?)
+        @monitor.broadcast
+        sleep(0.01)
+        assert(t.alive?)
+        assert(t.stop?)
+        stop = true
+        @monitor.signal
+        sleep(0.01)
+        assert(!t.alive?)
+        assert(t.stop?)
+    end
+
+    def test_waiters
+        t = []
+        (rand(20)+1).times{ t << Thread.new{ @monitor.wait } }
+        sleep(0.01)
+        assert_equal(t.size, @monitor.waiters)
+        @monitor.broadcast
+        sleep(0.01)
+        assert_equal(0, @monitor.waiters)
+    end
+
+    def test_lock_unlock
+        t = []
+        output = []
+        5.times{|i| t << Thread.new{ @monitor.lock; sleep((i+1)/100.0); output << i; @monitor.unlock;}}
+        sleep(0.011)
+        assert_equal(5, t.size)
+        assert_equal(0, output.pop)
+        sleep(0.011)
+        assert_equal(1, output.pop)
+        sleep(0.011)
+        assert_equal(2, output.pop)
+        sleep(0.011)
+        assert_equal(3, output.pop)
+        sleep(0.011)
+        assert_equal(4, output.pop)
+    end
+
+    def synchronize
+        t = []
+        output = []
+        5.times{|i| t << Thread.new{ @monitor.lock; sleep(i/100.0); output << i; @monitor.unlock;}}
+        @monitor.synchronize{ output << :done }
+        sleep(0.5)
+        assert_equal(6, output.size)
+    end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: splib
 version: !ruby/object:Gem::Version 
-  version: "1.2"
+  version: "1.3"
 platform: ruby
 authors: 
 - spox
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-10 00:00:00 -08:00
+date: 2010-01-12 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -23,6 +23,8 @@ extra_rdoc_files:
 - README.rdoc
 - CHANGELOG
 files: 
+- tests
+- tests/cases
 - tests/cases/Array.rb
 - tests/cases/PriorityQueue.rb
 - tests/cases/UrlShorteners.rb
@@ -30,11 +32,14 @@ files:
 - tests/cases/Constants.rb
 - tests/cases/CodeReloader.rb
 - tests/cases/HumanIdealRandomIterator.rb
+- tests/cases/Monitor.rb
 - tests/cases/Conversions.rb
 - tests/run_tests.rb
 - tests/samplecode2.rb
 - tests/samplecode1.rb
+- lib
 - lib/splib.rb
+- lib/splib
 - lib/splib/Array.rb
 - lib/splib/PriorityQueue.rb
 - lib/splib/UrlShorteners.rb
@@ -42,15 +47,14 @@ files:
 - lib/splib/Constants.rb
 - lib/splib/CodeReloader.rb
 - lib/splib/HumanIdealRandomIterator.rb
+- lib/splib/Monitor.rb
 - lib/splib/Conversions.rb
 - CHANGELOG
 - LICENSE
 - splib.gemspec
 - README.rdoc
-has_rdoc: true
+has_rdoc: false
 homepage: http://github.com/spox/splib
-licenses: []
-
 post_install_message: 
 rdoc_options: 
 - --title
@@ -75,9 +79,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.1
 signing_key: 
-specification_version: 3
+specification_version: 2
 summary: Spox Library
 test_files: []