workqueue 0.1.0 → 0.1.1

data/lib/workqueue.rb

@@ -4,15 +4,11 @@ class WorkQueue
   class ThreadsafeCounter
     def initialize(count=0)
       @count = count
+      @mutex = Mutex.new
     end
 
     def incr(by=1)
-      mutex.synchronize { @count += by }
-    end
-
-  private
-    def mutex
-      @mutex ||= Mutex.new
+      @mutex.synchronize { @count += by }
     end
   end
 
@@ -21,6 +17,7 @@ class WorkQueue
   def initialize(init_queue=[], opts={}, &job)
     @job = job
     @queue = Queue.new
+    @mutex = Mutex.new
 
     opts.each { |k, v| send(:"#{k}=", v) }
 
@@ -32,22 +29,33 @@ class WorkQueue
     @size ||= 2
   end
 
-  def workers
-    @workers ||= []
-  end
-
   def work!
-    until @aborted or (@joined and queue.empty?)
+    loop do
       begin
-        payload, index = queue.shift
+        # initialize these here so they can be set in
+        # the synchronize block
+        payload, index = []
+
+        @mutex.synchronize {
+          unless @aborted or (@joined and queue.empty?)
+            payload, index = queue.shift
+          end
+        }
+
+        break if payload.nil?
+
         aggregate[index] = job.call(payload)
       rescue Exception
-        @aborted = true
+        abort!
         raise
       end
     end
   end
 
+  def abort!
+    @aborted = true
+  end
+
   def run
     @workers = (1..size).map do
       Thread.new { work! }
@@ -57,7 +65,7 @@ class WorkQueue
   end
 
   def push(e)
-    @queue.push([e, cursor.incr])
+    queue.push([e, cursor.incr])
 
     self
   end
@@ -87,4 +95,8 @@ private
   def cursor
     @cursor ||= ThreadsafeCounter.new(-1)
   end
+
+  def workers
+    @workers ||= []
+  end
 end

data/lib/workqueue/version.rb

@@ -1,5 +1,5 @@
 class WorkQueue
   def self.version
-    '0.1.0'
+    '0.1.1'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: workqueue
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -38,7 +38,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1970191640167719375
+      hash: -1761209356095410953
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -47,7 +47,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1970191640167719375
+      hash: -1761209356095410953
 requirements: []
 rubyforge_project: workqueue
 rubygems_version: 1.8.10