work_queue 2.5.2 → 2.5.3

data/README.rdoc

@@ -37,7 +37,7 @@ It's generally recommended to bound the resources used:
 
 = Example(s)
 
-Download multiple files in parallel: 
+Download multiple files in parallel:
 
   require 'open-uri'
   require 'rubygems'

data/lib/test.rb

@@ -0,0 +1,12 @@
+require_relative 'work_queue'
+
+work_queue = WorkQueue.new(1000)
+
+# Force threads to be available - the work_queue gem seems to not always create the threads
+10000.times do |i|
+work_queue.enqueue_b do
+  a = 2
+end
+end
+
+puts "ola"

data/lib/work_queue.rb

@@ -5,7 +5,7 @@ require 'monitor'
 # A tunable work queue, designed to coordinate work between a producer and a pool of worker threads.
 #
 class WorkQueue
-  VERSION = "2.5.2"
+  VERSION = "2.5.3"
 
   ##
   # Creates an empty work queue with the desired parameters.
@@ -138,7 +138,7 @@ class WorkQueue
 
   ##
   # Halt all worker threads immediately, aborting any ongoing tasks.
-  # Resets all 
+  # Resets all
   #
   # ==== Example(s)
   #  wq = WorkQueue.new
@@ -185,7 +185,7 @@ class WorkQueue
       @task_dequeued.wait_until { @tasks.size < @max_tasks }
       @tasks << [proc, params]
       @tasks_pending += 1
-      @task_enqueued.signal
+      @task_enqueued.broadcast
     end
     spawn_thread
   end
@@ -233,7 +233,7 @@ class WorkQueue
       @task_enqueued.wait_while { @tasks.empty? }
       @threads_waiting -= 1
       task = @tasks.shift
-      @task_dequeued.signal
+      @task_dequeued.broadcast
       return task
     end
   end
@@ -244,7 +244,7 @@ class WorkQueue
   def conclude
     @tasks.synchronize do
       @tasks_pending -= 1
-      @task_completed.signal
+      @task_completed.broadcast
     end
   end
 end

data/test/tc_work_queue.rb

@@ -9,7 +9,7 @@ class TC_WorkQueue < Test::Unit::TestCase
     wq.join
     assert_equal "Hello Proc", s
   end
-  
+
   def test_enqueue_block
     s = String.new
     wq = WorkQueue.new
@@ -17,7 +17,7 @@ class TC_WorkQueue < Test::Unit::TestCase
     wq.join
     assert_equal "Hello Block", s
   end
-  
+
   def test_inner_enqueue
     s = String.new
     wq = WorkQueue.new
@@ -27,9 +27,9 @@ class TC_WorkQueue < Test::Unit::TestCase
       sleep 0.01
     end
     wq.join
-    assert_equal "Hello Inner", s 
+    assert_equal "Hello Inner", s
   end
-  
+
   def test_threads_recycle
     wq = WorkQueue.new
     wq.enqueue_b { sleep 0.01 }
@@ -51,7 +51,7 @@ class TC_WorkQueue < Test::Unit::TestCase
     assert_equal 1, wq.cur_threads
     wq.join
   end
-  
+
   def test_max_threads_validation
     assert_raise(ArgumentError) { WorkQueue.new 0, nil }
     assert_raise(ArgumentError) { WorkQueue.new -1, nil }
@@ -66,7 +66,7 @@ class TC_WorkQueue < Test::Unit::TestCase
     assert_equal 1, wq.cur_tasks
     wq.join
   end
-  
+
   def test_max_tasks_validation
     assert_raise(ArgumentError) { WorkQueue.new nil, 0 }
     assert_raise(ArgumentError) { WorkQueue.new nil, -1 }
@@ -76,34 +76,34 @@ class TC_WorkQueue < Test::Unit::TestCase
     i = 0
     m = Mutex.new
     wq = WorkQueue.new 100, 200
-    (1..10000).each do
+    (1..1000).each do
       wq.enqueue_b {
         sleep 0.01
         m.synchronize { i += 1 }
       }
     end
     wq.join
-    assert_equal 10000, i
+    assert_equal 1000, i
   end
-  
+
   def test_stress_prolonged
     i = 0
     m = Mutex.new
     wq = WorkQueue.new 100, 200
-    (1..10000).each do
+    (1..1000).each do
       wq.enqueue_b {
         sleep rand(5)
         m.synchronize { i += 1 }
       }
     end
     wq.join
-    assert_equal 10000, i
+    assert_equal 1000, i
   end
 
   def test_kill
     s = String.new
     wq = WorkQueue.new
-    wq.enqueue_b(s) { |str| 
+    wq.enqueue_b(s) { |str|
       sleep 0.1
       str.replace "Hello"
     }

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: work_queue
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 2
   - 5
-  - 2
-  version: 2.5.2
+  - 3
+  version: 2.5.3
 platform: ruby
 authors: 
 - Miguel Fonseca
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-22 00:00:00 Z
+date: 2013-02-23 00:00:00 Z
 dependencies: []
 
 description: 
@@ -32,6 +32,7 @@ files:
 - Rakefile
 - README.rdoc
 - tasks/test.rake
+- lib/test.rb
 - lib/work_queue.rb
 - test/tc_work_queue.rb
 homepage: http://github.com/fmmfonseca/work_queue