splib 1.4 → 1.4.1

data/CHANGELOG

@@ -1,3 +1,7 @@
+1.4.1
+    * Updates in Monitor to attempt to force
+        threads to stay put
+    * Fix Monitor's locking/unlocking
 1.4
     * Clean up exclusive usage in Monitor
     * Add a timeout on Monitor#wait

data/README.rdoc

@@ -104,12 +104,17 @@ Find constants easily, especially within loaded modules
         end"
     )
     p Splib.find_const('String')
-    p Splib.find_const('Fu::Bar', [mod])
+    fb = Splib.find_const('Fu::Bar', [mod]).new
+    p fb
+    p Splib.type_of?(fb, 'Fu::Bar')
+
 
     Results:
 
     String
-    #<Module:0x95f02a4>::Fu::Bar
+    #<#<Module:0x95f2fd0>::Fu::Bar:0x95f287c>
+    true
+
 
 ==== PriorityQueue
 
@@ -135,6 +140,51 @@ Add some logic to item queueing
     fubar
     last
 
+==== Float
+
+Need to know if your float is within a delta?
+
+    require 'splib'
+    Splib.load :Float
+
+    p 4.21.within_delta?(:expected => 4.30, :delta => 0.1)
+
+    => true
+
+==== Monitor
+
+Annoyed that your monitor is generating thread owner errors? This simple
+monitor does its best to ensure your threads stay where they are supposed.
+
+    require 'splib'
+    Splib.load :Monitor
+
+    output = []
+    go = false
+    monitor = Splib::Monitor.new
+    t = Thread.new{ monitor.wait_until{go}; output << :foo}
+    Thread.new{ monitor.wait_while{!go}; output << :bar}
+    Thread.new{ monitor.wait; output << :foobar }
+    Thread.pass
+    monitor.broadcast
+    t.wakeup
+    Thread.pass
+    p output
+    go = true
+    monitor.signal
+    Thread.pass
+    p output
+    Thread.pass
+    monitor.broadcast
+    Thread.pass
+    p output
+
+    Results:
+
+    [:foobar]
+    [:foobar, :foo]
+    [:foobar, :foo, :bar]
+
 ==== TODO: Write examples for CodeReloader and RandomIterator
 
 == Last remarks

data/Rakefile

@@ -0,0 +1,52 @@
+# 
+# To change this template, choose Tools | Templates
+# and open the template in the editor.
+ 
+
+require 'rubygems'
+require 'rake'
+require 'rake/clean'
+require 'rake/gempackagetask'
+require 'rake/rdoctask'
+require 'rake/testtask'
+require 'spec/rake/spectask'
+
+spec = Gem::Specification.new do |s|
+    s.name              = 'splib'
+    s.author            = 'spox'
+    s.email             = 'spox@modspox.com'
+    s.version           = '1.4.1'
+    s.summary           = 'Spox Library'
+    s.platform          = Gem::Platform::RUBY
+    s.files             = %w(LICENSE README.rdoc CHANGELOG Rakefile) + Dir.glob("{bin,lib,spec,test}/**/*")
+    s.rdoc_options      = %w(--title splib --main README.rdoc --line-numbers)
+    s.extra_rdoc_files  = %w(README.rdoc CHANGELOG)
+    s.require_paths     = %w(lib)
+    s.required_ruby_version = '>= 1.8.6'
+    s.homepage          = %q(http://github.com/spox/splib)
+    s.description         = "The spox library contains various useful tools to help you in your day to day life. Like a trusty pocket knife, only more computery."
+end
+
+Rake::GemPackageTask.new(spec) do |p|
+  p.gem_spec = spec
+  p.need_tar = true
+  p.need_zip = true
+end
+
+Rake::RDocTask.new do |rdoc|
+  files =['README', 'LICENSE', 'lib/**/*.rb']
+  rdoc.rdoc_files.add(files)
+  rdoc.main = "README" # page to start on
+  rdoc.title = "splib Docs"
+  rdoc.rdoc_dir = 'doc/rdoc' # rdoc output folder
+  rdoc.options << '--line-numbers'
+end
+
+Rake::TestTask.new do |t|
+  t.test_files = FileList['test/**/*.rb']
+end
+
+Spec::Rake::SpecTask.new do |t|
+  t.spec_files = FileList['spec/**/*.rb']
+  t.libs << Dir["lib"]
+end

data/lib/splib/Monitor.rb

@@ -15,7 +15,12 @@ module Splib
             if(timeout)
                 timout = timeout.to_f
                 @timers[Thread.current] = Thread.new(Thread.current) do |t|
-                    sleep(timeout)
+                    time = 0.0
+                    until(time >= timeout) do
+                        s = Time.now.to_f
+                        sleep(timeout - time)
+                        time += Time.now.to_f - s
+                    end
                     t.wakeup
                 end
             end
@@ -64,7 +69,11 @@ module Splib
         end
         # Lock the monitor
         def lock
-            Thread.stop if Thread.exclusive{ do_lock }
+            if(Thread.exclusive{do_lock})
+                until(owner?(Thread.current)) do
+                    Thread.stop
+                end
+            end
         end
         # Unlock the monitor
         def unlock
@@ -87,9 +96,13 @@ module Splib
 
         private
 
+        def owner?(t)
+            @lock_owner == t
+        end
+
         def do_lock
             stop = false
-            unless(@locks.empty?)
+            if(@lock_owner)
                 @locks << Thread.current
                 stop = true
             else
@@ -99,11 +112,11 @@ module Splib
         end
 
         def do_unlock
-            unless(@lock_owner == Thread.current)
+            unless(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?}
+                @locks.delete_if{|t|!t.alive?}
                 @lock_owner = @locks.shift
                 @lock_owner.wakeup
             else

data/{tests → test}/cases/Monitor.rb

@@ -21,10 +21,11 @@ class MonitorTest < Test::Unit::TestCase
         t = []
         o = []
         5.times{|i| t << Thread.new{ @monitor.wait((i+1)/100.0); o << 1 } }
-        sleep(0.015)
+        sleep(0.011)
+        Thread.pass
         assert(!t.shift.alive?)
         assert_equal(1, o.size)
-        sleep(0.11)
+        sleep(0.1)
         assert_equal(5, o.size)
         t.each do |th|
             assert(!th.alive?)
@@ -120,18 +121,28 @@ class MonitorTest < Test::Unit::TestCase
     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)
+        3.times{|i| t << Thread.new{ @monitor.lock; sleep((i+1)/100.0); output << i; @monitor.unlock;}}
         sleep(0.011)
-        assert_equal(2, output.pop)
-        sleep(0.011)
-        assert_equal(3, output.pop)
-        sleep(0.011)
-        assert_equal(4, output.pop)
+        assert_equal(1, output.size)
+        sleep(0.021)
+        assert_equal(2, output.size)
+        sleep(0.031)
+        assert_equal(3, output.size)
+        assert(!t.any?{|th|th.alive?})
+        3.times{|i|assert_equal(i, output.shift)}
+    end
+    
+    def test_lock_unlock_wakeup
+        complete = false
+        t1 = Thread.new{@monitor.lock; sleep(0.1); @monitor.unlock}
+        t2 = Thread.new{@monitor.lock; complete = true; @monitor.unlock}
+        assert(!complete)
+        assert(t1.alive?)
+        t2.wakeup
+        Thread.pass
+        assert(!complete)
+        sleep(0.11)
+        assert(complete)
     end
 
     def synchronize

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: splib
 version: !ruby/object:Gem::Version 
-  version: "1.4"
+  version: 1.4.1
 platform: ruby
 authors: 
 - spox
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-13 00:00:00 -08:00
+date: 2010-01-19 00:00:00 -08:00
 default_executable: 
 dependencies: []
 
@@ -23,19 +23,10 @@ extra_rdoc_files:
 - README.rdoc
 - CHANGELOG
 files: 
-- 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
-- tests/cases/Conversions.rb
-- tests/run_tests.rb
-- tests/samplecode2.rb
-- tests/samplecode1.rb
+- LICENSE
+- README.rdoc
+- CHANGELOG
+- Rakefile
 - lib/splib.rb
 - lib/splib/Array.rb
 - lib/splib/PriorityQueue.rb
@@ -47,11 +38,20 @@ files:
 - lib/splib/HumanIdealRandomIterator.rb
 - lib/splib/Monitor.rb
 - lib/splib/Conversions.rb
-- CHANGELOG
-- LICENSE
-- splib.gemspec
-- README.rdoc
-- splib-1.4.gem
+- spec/dummy.rb
+- test/cases/Array.rb
+- test/cases/PriorityQueue.rb
+- test/cases/UrlShorteners.rb
+- test/cases/Exec.rb
+- test/cases/Constants.rb
+- test/cases/Float.rb
+- test/cases/CodeReloader.rb
+- test/cases/HumanIdealRandomIterator.rb
+- test/cases/Monitor.rb
+- test/cases/Conversions.rb
+- test/run_tests.rb
+- test/samplecode2.rb
+- test/samplecode1.rb
 has_rdoc: true
 homepage: http://github.com/spox/splib
 licenses: []

data/splib.gemspec

@@ -1,15 +0,0 @@
-spec = Gem::Specification.new do |s|
-    s.name              = 'splib'
-    s.author            = 'spox'
-    s.email             = 'spox@modspox.com'
-    s.version           = '1.4'
-    s.summary           = 'Spox Library'
-    s.platform          = Gem::Platform::RUBY
-    s.files             = Dir['**/*']
-    s.rdoc_options      = %w(--title splib --main README.rdoc --line-numbers)
-    s.extra_rdoc_files  = %w(README.rdoc CHANGELOG)
-    s.require_paths     = %w(lib)
-    s.required_ruby_version = '>= 1.8.6'
-    s.homepage          = %q(http://github.com/spox/splib)
-    s.description         = "The spox library contains various useful tools to help you in your day to day life. Like a trusty pocket knife, only more computery."
-end