concur 0.0.2 → 0.0.4

data/README.markdown

@@ -1 +1 @@
-# Concur - A concurrency library for Ruby like java.util.concurrency
+# Concur - A concurrency library for Ruby inspired by java.util.concurrency

data/lib/executor.rb

@@ -19,31 +19,55 @@ module Concur
 
     end
 
-    def self.new_thread_pool_executor(options={})
+    def self.new_single_threaded_executor(options={})
       executor = Executor.new
-      executor.thread_pool = ThreadPool.new(options[:max_size])
-      p executor.thread_pool
+      executor.thread_pool = SingleThreaded.new
       executor
     end
 
-    def execute(runnable, &blk)
-      puts 'executing ' + runnable.inspect
+    def self.new_multi_threaded_executor(options={})
+      executor = Executor.new
+      executor.thread_pool = MultiThreaded.new
+      executor
+    end
+
+    def self.new_thread_pool_executor(max_size, options={})
+      executor = Executor.new
+      executor.thread_pool = ThreadPool.new(max_size)
+      executor
+    end
+
+    def execute(runnable=nil, &blk)
       f = Future.new(runnable, &blk)
-      if @thread_pool
-        @thread_pool.process(f)
-      else
-        @thread = Thread.new do
-          f.thread = @thread
-          f.call
-        end
-      end
+      @thread_pool.process(f)
       f
     end
 
     def shutdown
-       if @thread_pool
-         @thread_pool.shutdown
-       end
+      @thread_pool.shutdown
+    end
+  end
+
+  # todo: should maybe have these backends extend Executor and just override what's necessary
+  class SingleThreaded
+    def process(f)
+      f.call
+    end
+
+    def shutdown
+    end
+  end
+
+  class MultiThreaded
+    def process(f)
+      @thread = Thread.new do
+        f.thread = @thread
+        f.call
+      end
+    end
+
+    def shutdown
+
     end
   end
 end

data/lib/future.rb

@@ -3,20 +3,10 @@ module Concur
   #An Future is a class that captures the results of a threaded object so you can retreive the results later.
   #This is what is returned from Executors.
   class Future
-    attr_accessor :thread, :pool
+    attr_accessor :thread
 
     def initialize(runnable=nil, &block)
 
-#      if block
-#        @thread = Thread.new do
-#          @result = yield
-#        end
-#      else
-#        @thread = Thread.new do
-#          @result = runnable.run
-#        end
-#      end
-
       @mutex = Mutex.new
       @cv = ConditionVariable.new
       @callable = runnable
@@ -27,15 +17,25 @@ module Concur
     end
 
     def run
-      @result = @callable.call
-      @complete = true
-      @cv.signal
+      begin
+        @result = @callable.call
+      rescue Exception => ex
+        @ex = ex
+      end
+      @mutex.synchronize do # do we even need to synchronize? run should only ever be called once
+        @complete = true
+        @cv.broadcast
+      end
     end
 
     def call
       run
     end
 
+    def complete?
+      @complete
+    end
+
     # Returns results. Will wait for thread to complete execution if not already complete.
     def get
 #      @thread.value
@@ -44,6 +44,9 @@ module Concur
           @cv.wait(@mutex)
         end
       end
+      if @ex
+        raise @ex
+      end
       @result
     end
   end

data/lib/thread_pool.rb

@@ -37,12 +37,11 @@ module Concur
             while @running
               f = @queue.pop
               f.thread = t
-              f.pool = self
               f.call
             end
-            Concur.logger.info "Thread dying " + t.inspect
+#            Concur.logger.info "Thread dying " + t.inspect
           end
-          Concur.logger.info "Created new thread " + t.inspect
+          Concur.logger.debug "Created new thread " + t.inspect
           @threads << t
         end
       end

data/test/executor_spec.rb

@@ -6,11 +6,12 @@ require_relative 'job'
 describe Concur::Executor do
   describe "#score" do
     it "runs faster in parallel" do
+      times = 10
 
       job = Job.new(1)
       puts 'runnable? ' + job.is_a?(Concur::Runnable).to_s
       start_time = Time.now
-      20.times do |i|
+      times.times do |i|
         job = Job.new(i)
         job.run
       end
@@ -20,14 +21,13 @@ describe Concur::Executor do
       puts '---------------'
 
       puts "Now for concurrent"
-      executor = Concur::Executor.new # unbounded
+      executor = Concur::Executor.new_multi_threaded_executor
       start_time = Time.now
 
       jobs = []
-      20.times do |i|
+      times.times do |i|
         job = Job.new(i)
-        future = executor.execute(job)
-        jobs << future
+        jobs << executor.execute(job)
       end
       jobs.each do |j|
         puts "uber fast result=#{j.get}"
@@ -38,11 +38,11 @@ describe Concur::Executor do
       concurrent_duration.should be < (non_concurrent_duration/2)
 
       puts "Now for pooled"
-      executor = Concur::Executor.new_thread_pool_executor(:max_size=>10)
+      executor = Concur::Executor.new_thread_pool_executor(10)
       start_time = Time.now
 
       jobs = []
-      20.times do |i|
+      times.times do |i|
         job = Job.new(i)
         future = executor.execute(job)
         jobs << future

data/test/job.rb

@@ -8,7 +8,7 @@ class Job
   end
 
   def run
-    sleep 0.25
+    sleep 3
     puts "Finished #{@i}"
     "response #{@i}"
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: concur
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &22290888 !ruby/object:Gem::Requirement
+  requirement: &25999668 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,8 +22,9 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *22290888
-description: A concurrency library for Ruby like java.util.concurrency By http://www.appoxy.com
+  version_requirements: *25999668
+description: A concurrency library for Ruby inspired by java.util.concurrency. By
+  http://www.appoxy.com
 email: travis@appoxy.com
 executables: []
 extensions: []
@@ -59,10 +60,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.6.0
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
-summary: A concurrency library for Ruby like java.util.concurrency. By http://www.appoxy.com
+summary: A concurrency library for Ruby inspired by java.util.concurrency. By http://www.appoxy.com
 test_files:
 - test/executor_spec.rb
 - test/job.rb