splib 1.3 → 1.4

data/CHANGELOG

@@ -1,3 +1,8 @@
+1.4
+    * Clean up exclusive usage in Monitor
+    * Add a timeout on Monitor#wait
+    * Add Monitor#locked?
+    * Add Float library to define Float#within_delta?
 1.3
     * Add simple monitor
 1.2

data/lib/splib.rb

@@ -4,6 +4,7 @@ module Splib
             :Constants,
             :Conversions,
             :Exec,
+            :Float,
             :HumanIdealRandomIterator,
             :Monitor,
             :PriorityQueue,

data/lib/splib/Float.rb

@@ -0,0 +1,18 @@
+module Splib
+    # While not a big fan of monkeypatching, I want to be
+    # lazy getting to this
+    class ::Float
+        def within_delta?(args={})
+            raise ArgumentError.new('Missing required argument: :expected') unless args[:expected]
+            raise ArgumentError.new('Missing required argument: :delta') unless args[:delta]
+            e = args[:expected].to_f
+            d = args[:delta].to_f
+            mult = 0
+            if(pos = d.to_s.index('.'))
+                mult = (d.to_s.length - (pos + 1))
+            end
+            mult = 10 ** mult
+            ((e*mult) - (self*mult)).abs <= (d*mult)
+        end
+    end
+end

data/lib/splib/Monitor.rb

@@ -7,12 +7,27 @@ module Splib
             @threads = []
             @locks = []
             @lock_owner = nil
+            @timers = {}
         end
         # timeout:: Wait for given amount of time
         # Park a thread here
         def wait(timeout=nil)
+            if(timeout)
+                timout = timeout.to_f
+                @timers[Thread.current] = Thread.new(Thread.current) do |t|
+                    sleep(timeout)
+                    t.wakeup
+                end
+            end
             @threads << Thread.current
             Thread.stop
+            @threads.delete(Thread.current)
+            if(timeout)
+                if(@timers[Thread.current].alive?)
+                    @timers[Thread.current].kill
+                end
+                @timers.delete(Thread.current)
+            end
             true
         end
         # Park thread while block is true
@@ -29,19 +44,19 @@ module Splib
         end
         # Wake up earliest thread
         def signal
-            lock
-            t = @threads.shift
-            t.wakeup if t.alive?
-            unlock
+            synchronize do
+                t = @threads.shift
+                t.wakeup if t && t.alive?
+            end
         end
         # Wake up all threads
         def broadcast
-            lock
-            @threads.each do |t|
-                t.wakeup if t.alive?
+            synchronize do
+                @threads.each do |t|
+                    t.wakeup if t.alive?
+                end
+                @threads.clear
             end
-            @threads.clear
-            unlock
         end
         # Number of threads waiting
         def waiters
@@ -49,38 +64,51 @@ module Splib
         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
+            Thread.stop if Thread.exclusive{ do_lock }
         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 
+            Thread.exclusive{ do_unlock }
+        end
+        # Is monitor locked
+        def locked?
+            @locks.size > 0
         end
         # Lock the monitor, execute block and unlock the monitor
         def synchronize
-            lock
-            yield
-            unlock
+            result = nil
+            Thread.exclusive do
+                do_lock
+                result = yield
+                do_unlock
+            end
+            result
+        end
+
+        private
+
+        def do_lock
+            stop = false
+            unless(@locks.empty?)
+                @locks << Thread.current
+                stop = true
+            else
+                @lock_owner = Thread.current
+            end
+            stop
+        end
+
+        def do_unlock
+            unless(@lock_owner == Thread.current)
+                raise ThreadError.new("Thread #{Thread.current} is not the current owner: #{@lock_owner}")
+            end
+            unless(@locks.empty?)
+                @locks.delete{|t|!t.alive?}
+                @lock_owner = @locks.shift
+                @lock_owner.wakeup
+            else
+                @lock_owner = nil
+            end
         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.3'
+    s.version           = '1.4'
     s.summary           = 'Spox Library'
     s.platform          = Gem::Platform::RUBY
     s.files             = Dir['**/*']

data/tests/cases/Float.rb

@@ -0,0 +1,20 @@
+require 'splib'
+require 'test/unit'
+
+class FloatTest < Test::Unit::TestCase
+    def setup
+        Splib.load :Float
+    end
+    
+    def test_delta
+        t = 3.2
+        assert(3.204.within_delta?(:expected => t, :delta => 0.1))
+        assert(3.3.within_delta?(:expected => t, :delta => 0.1))
+        assert(3.3.within_delta?(:expected => t, :delta => 0.1))
+        assert(3.1.within_delta?(:expected => t, :delta => 0.1))
+        assert(!(3.09.within_delta?(:expected => t, :delta => 0.1)))
+        assert(!(3.31.within_delta?(:expected => t, :delta => 0.1)))
+        assert(3.0.within_delta?(:expected => 4, :delta => 1))
+        assert(!(3.0.within_delta?(:expected => 5, :delta => 1)))
+    end
+end

data/tests/cases/Monitor.rb

@@ -17,6 +17,20 @@ class MonitorTest < Test::Unit::TestCase
         end
     end
 
+    def test_wait_timeout
+        t = []
+        o = []
+        5.times{|i| t << Thread.new{ @monitor.wait((i+1)/100.0); o << 1 } }
+        sleep(0.015)
+        assert(!t.shift.alive?)
+        assert_equal(1, o.size)
+        sleep(0.11)
+        assert_equal(5, o.size)
+        t.each do |th|
+            assert(!th.alive?)
+        end
+    end
+
     def test_signal
         output = []
         t = []

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: splib
 version: !ruby/object:Gem::Version 
-  version: "1.3"
+  version: "1.4"
 platform: ruby
 authors: 
 - spox
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-12 00:00:00 -08:00
+date: 2010-01-13 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -23,13 +23,12 @@ extra_rdoc_files:
 - README.rdoc
 - CHANGELOG
 files: 
-- tests
-- tests/cases
 - tests/cases/Array.rb
 - tests/cases/PriorityQueue.rb
 - tests/cases/UrlShorteners.rb
 - tests/cases/Exec.rb
 - tests/cases/Constants.rb
+- tests/cases/Float.rb
 - tests/cases/CodeReloader.rb
 - tests/cases/HumanIdealRandomIterator.rb
 - tests/cases/Monitor.rb
@@ -37,14 +36,13 @@ files:
 - 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
 - lib/splib/Exec.rb
 - lib/splib/Constants.rb
+- lib/splib/Float.rb
 - lib/splib/CodeReloader.rb
 - lib/splib/HumanIdealRandomIterator.rb
 - lib/splib/Monitor.rb
@@ -53,8 +51,11 @@ files:
 - LICENSE
 - splib.gemspec
 - README.rdoc
-has_rdoc: false
+- splib-1.4.gem
+has_rdoc: true
 homepage: http://github.com/spox/splib
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --title
@@ -79,9 +80,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.1
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Spox Library
 test_files: []