performer 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b01b56f2d0d88ec08d5176a59a2de1dfe8b025e
-  data.tar.gz: 78df656923eac0cad6786f66711c96bf7418b006
+  metadata.gz: a250c679853af97347a737874d8a0a8b3b7ddb78
+  data.tar.gz: fe3bcde1000a4cc3fbcb1f56f297fd79aa74b8cd
 SHA512:
-  metadata.gz: 86dd766848014e7b269fe8cb8e913a3ce8dfd413c38495303938631dfe5f1aa99036e40540704199eea6eacfef25720cd2b1d3646fccd22de54c3ba84729f99e
-  data.tar.gz: b2e0f32c4e36c6f762585873137415aa059c80bebee8467759f56c1cab83bd7be9ef16d0042e5a65ac0bd7df677349ee0f24d88ff5dff0a5d70aa26f6e316d9b
+  metadata.gz: 2208038144729ad0d336aa9ce65e5d3968b23ac3d154d9434fc6e7990886578c42b694606d659dc9aab22d2e55446546bb82c0103956001face9683074413d03
+  data.tar.gz: 3955b07024be6c971a0ed947ef9252dfefa167e43f6e8da2f7a9066193b521ed6278153a04f5706fa168ca6847c12439bf26fc354b21130c24251928ac3082d1

data/CHANGELOG.md

@@ -0,0 +1,8 @@
+v1.0.1:
+- Make Performer::Queue#enq re-entrant, allows scheduling tasks from
+  object finalizers (at least in MRI) [868f8ca0]
+- Keep track of currently executing tasks internally. No public API,
+  but should help with debugging. [d35438f4]
+
+v1.0.0:
+- First release!

data/lib/performer.rb

@@ -22,6 +22,8 @@ class Performer
     @queue = Performer::Queue.new
     @running = true
     @thread = Thread.new(&method(:run_loop))
+
+    @current_task = nil
     @shutdown_task = Task.new(lambda do
       @running = false
       nil
@@ -80,13 +82,7 @@ class Performer
 
   def run_loop
     while @running
-      open = @queue.deq do |task|
-        begin
-          task.call
-        rescue Performer::Task::Error
-          # No op. Allows cancelling scheduled tasks.
-        end
-      end
+      open = @queue.deq { |task| with_task(task, &:call) }
 
       if not open and @queue.empty?
         @running = false
@@ -95,15 +91,19 @@ class Performer
   ensure
     @queue.close
     until @queue.empty?
-      @queue.deq do |task|
-        begin
-          task.cancel
-        rescue Performer::Task::Error
-          # Shutting down. Don't care.
-        end
-      end
+      @queue.deq { |task| with_task(task, &:cancel) }
     end
   end
+
+  def with_task(task)
+    @current_task = task
+    yield task
+  rescue Performer::Task::Error
+    # Performer calling task does not care if you cancelled
+    # task, or if you called task earlier. We skip it.
+  ensure
+    @current_task = nil
+  end
 end
 
 require "performer/condition_variable"

data/lib/performer/condition_variable.rb

@@ -1,3 +1,4 @@
+require "thread"
 require "forwardable"
 
 class Performer

data/lib/performer/queue.rb

@@ -1,10 +1,12 @@
+require "monitor"
+
 class Performer
   # Similar to the stdlib Queue, but with a thread-safe way of closing it down.
   class Queue
     def initialize
       @queue = []
-      @queue_mutex = Mutex.new
-      @queue_cond = Performer::ConditionVariable.new
+      @queue_mutex = Monitor.new
+      @queue_cond = @queue_mutex.new_cond
       @undefined = {}
       @open = true
     end
@@ -57,9 +59,7 @@ class Performer
       end
 
       obj, was_open = @queue_mutex.synchronize do
-        while empty? and open?
-          @queue_cond.wait(@queue_mutex)
-        end
+        @queue_cond.wait_while { empty? and open? }
 
         obj = if empty?
           undefined

data/lib/performer/version.rb

@@ -1,4 +1,4 @@
 class Performer
   # Current version of Performer.
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/performer.gemspec

@@ -21,6 +21,6 @@ and optionally waiting for the return value.}
 
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec", [">= 3.0.0.rc1", "< 4.0"]
+  spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "yard", "~> 0.8"
 end

data/spec/{puddle → performer}/queue_spec.rb

@@ -56,7 +56,7 @@ describe Performer::Queue do
         Thread.new(queue) { |q| dequeue(q) }
       end
 
-      before { wait_until_sleep(waiter) }
+      before { wait_until(waiter, "sleep") }
 
       specify "is awoken when an object is added" do
         queue.enq(1) { raise "enq failed" }

data/spec/{puddle → performer}/task_spec.rb

@@ -12,7 +12,7 @@ describe Performer::Task do
     it "raises an error when called during execution" do
       task = Performer::Task.new(lambda { sleep })
       thread = Thread.new(task, &:call)
-      wait_until_sleep(thread)
+      wait_until(thread, "sleep")
 
       lambda { task.call }.should raise_error(Performer::Task::InvariantError)
     end
@@ -50,7 +50,7 @@ describe Performer::Task do
     it "raises an error when called during execution" do
       task = Performer::Task.new(lambda { sleep; :ok })
       thread = Thread.new(task, &:call)
-      wait_until_sleep(thread)
+      wait_until(thread, "sleep")
 
       lambda { task.cancel }.should raise_error(Performer::Task::InvariantError)
 
@@ -90,7 +90,7 @@ describe Performer::Task do
 
     context "task receives a result later on" do
       let(:waiter) { Thread.new(task, &:value) }
-      before(:each) { wait_until_sleep(waiter) }
+      before(:each) { wait_until(waiter, "sleep") }
 
       it "is woken up once a value is available" do
         task.call

data/spec/{puddle_spec.rb → performer_spec.rb}

@@ -73,7 +73,7 @@ describe Performer do
     it "performs a clean shutdown, allowing scheduled tasks to finish" do
       stopgap = Queue.new
       waiter = Thread.new(Thread.current) do |thread|
-        wait_until_sleep(thread)
+        wait_until(thread, "sleep")
         stopgap.push :go
       end
 

data/spec/spec_helper.rb

@@ -2,8 +2,8 @@ require "performer"
 require "timeout"
 
 module ConcurrencyUtilities
-  def wait_until_sleep(thread)
-    Thread.pass until thread.status == "sleep"
+  def wait_until(thread, status)
+    Thread.pass until thread.status == status
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: performer
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Kim Burgestrand
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-03 00:00:00.000000000 Z
+date: 2014-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -42,22 +42,16 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.0.rc1
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.0.rc1
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -84,6 +78,7 @@ files:
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -94,9 +89,9 @@ files:
 - lib/performer/task.rb
 - lib/performer/version.rb
 - performer.gemspec
-- spec/puddle/queue_spec.rb
-- spec/puddle/task_spec.rb
-- spec/puddle_spec.rb
+- spec/performer/queue_spec.rb
+- spec/performer/task_spec.rb
+- spec/performer_spec.rb
 - spec/spec_helper.rb
 homepage: ''
 licenses:
@@ -118,13 +113,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Schedule blocks in a background thread.
 test_files:
-- spec/puddle/queue_spec.rb
-- spec/puddle/task_spec.rb
-- spec/puddle_spec.rb
+- spec/performer/queue_spec.rb
+- spec/performer/task_spec.rb
+- spec/performer_spec.rb
 - spec/spec_helper.rb
 has_rdoc: