parallel_tasker 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f4d9dc4e614c5092e3e3fb9f9ab98bd4a0e295d4
-  data.tar.gz: 0c78457e01b3501c4f438696c7894427e14635de
+  metadata.gz: 6dd857a5fca48478d3c8cfaa8c8ee6084e124c3d
+  data.tar.gz: eb266b7089b264a51a8af2797686e7820cdc6c9e
 SHA512:
-  metadata.gz: ed83725b491608eba9e48f2b81ba2ca838a0ba9e07357496f3fcaf4a1dbedfa1c33b9ae65857493006f754aa15ed4530751387c8f1f3b75d2e9efc3d3e4e2e2b
-  data.tar.gz: 790488766ebfe04a839f02f67390e007d5e763177f495d817211acd4ef71a43a539482cc4b0073069b8d851bc3579bb46d48951d0a66a252e709f96e2def9b3c
+  metadata.gz: bd5657fce49273dc76034370db145b5137f979b5b655e5baa35e3c460c7c263529198c463423b6e9466c13e3048a07be1e063179773d0b929aa1107ee1f0f55a
+  data.tar.gz: 89d67e1dcf2da7c7bcc431384ef067508d9418b201fb8d2c9dc784199ccb5dfa306c156dedbf70ac98e657abf5eaa1edfcb1c879c95ecab194f745aca8bb12a8

data/lib/parallel_tasker.rb

@@ -1,5 +1,7 @@
 require 'thwait'
 
+require_relative 'parallel_tasker/task'
+
 # Run tasks in parallel threads
 class ParallelTasker
  
@@ -8,7 +10,7 @@ class ParallelTasker
   # Unless block calls #run, it is called automatically.
   def initialize concurrency
     @concurrency = concurrency
-    @tasks = {}
+    @tasks_queue = Queue.new
     @already_run = false
     if block_given?
       yield self
@@ -17,17 +19,12 @@ class ParallelTasker
   end
  
   # Add task to be executed.
-  def add_task id, &task
-    @tasks[id] = task
+  def add_task id, &block
+    @tasks_queue << Task.new(id, &block)
   end
 
   alias_method :<<, :add_task
 
-  # Return block for task with given id
-  def task id
-    @tasks[id]
-  end
-
   class DoubleRun < RuntimeError ; end
  
   # Execute all tasks in separate threads, with maximum asked concurrency of parallel
@@ -37,44 +34,29 @@ class ParallelTasker
   def run
     raise DoubleRun.new('#run called more than one time') if @already_run
     @already_run = true
-    @threads = {}
-    @concurrency = @tasks.size if @concurrency > @tasks.size
-    pending_ids = @tasks.keys
-    @already_running_ids = []
-    completed_ids = []
-    # start initial batch
-    pending_ids.shift(@concurrency).each{|id| new_thread(id)}
-    # wait for termination
-    twait = ThreadsWait.new(*running_threads)
-    twait.all_waits do |finished_thread|
-      # update arrays
-      completed_id = @threads.key(finished_thread)
-      @already_running_ids.delete completed_id
-      completed_ids << completed_id
-      # start new thread if available and below concurrency
-      if not pending_ids.empty? and @already_running_ids.size < @concurrency
-        new_id = pending_ids.shift
-        new_thread new_id
-        twait.join_nowait *running_threads
-      end
+    @result = {}
+    processor_threads = []
+    @concurrency.times do
+      processor_threads << new_processor_thread
     end
-    @threads
+    processor_threads.each{|t| t.join }
+    @result
   end
- 
+
   private
- 
-  # Create a new thread based on given id
-  def new_thread id
-    @threads[id] = Thread.new &@tasks[id]
-    @already_running_ids << id
-  end
- 
-  # return array of all running threads
-  def running_threads
-    rt = []
-    @already_running_ids.each do |id|
-      rt << @threads[id]
+
+  def new_processor_thread
+    Thread.new do
+      until @tasks_queue.empty?
+        task = @tasks_queue.pop
+        thread = Thread.new{task.block.call}
+        @result[task.id] = thread
+        begin
+          thread.join
+        rescue
+        end
+      end
     end
-    rt
   end
+ 
 end

data/lib/parallel_tasker/task.rb

@@ -0,0 +1,18 @@
+class ParallelTasker
+  # Task to be run
+  class Task
+
+    attr_accessor :id, :block
+
+    # Raised when no block was given
+    class NoBlockGiven < RuntimeError ; end
+
+    # Receive a task id, an a block with the task
+    def initialize id, &block
+      raise NoBlockGiven.new("No block given") unless block
+      @id = id
+      @block = block
+    end
+
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parallel_tasker
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Fabio Pugliese Ornellas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-28 00:00:00.000000000 Z
+date: 2015-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -24,6 +24,40 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.2'
+- !ruby/object:Gem::Dependency
+  name: guard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.12'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.12.5
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.12'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.12.5
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.5'
 description: Collects tasks to be run, then execute in parallel, with maximum specified
   concurrency.
 email: fabio.ornellas@gmail.com
@@ -32,6 +66,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/parallel_tasker.rb
+- lib/parallel_tasker/task.rb
 homepage: https://github.com/fornellas/parallel_tasker
 licenses:
 - GPL