parallel 1.8.0 → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1cfb32f76c7f232bcd3f44e8370af1e61882de3a
-  data.tar.gz: edab2b1cf2013b37cb7a58908750bfb1221327a8
+  metadata.gz: 12ab9909c74851e485eb8565aec2216e9338b300
+  data.tar.gz: 44ec37a9e9ca726a406ccd40e8f34224950ce901
 SHA512:
-  metadata.gz: 99aa1aaefc20811d7540d607521f76b0edf10b09f5e96d1997341b5a12305d136355ae62e54380d5095111840d2258f8aa09e7a36abff52fdd79cb8f3d392c30
-  data.tar.gz: 3f4255effe94025fa160ec1ef0f47a1a319c7036a4910f762b95218a7ddcc7b118edc60fb884b2ba8af39959e6b74b51d7b16d1dd8d235ed89ec28505997019f
+  metadata.gz: 2d427df65610e20fb2b7da6c572565de3c9cb6dc6fc3a5b483f41d30514675d67b47f05a51579f04ab0a384cb642b5aef272e9c682d584c9e92c43762fb0bd2a
+  data.tar.gz: 2f48e8be3267f707ba4d43596d2489e7c54564be466a9155bbd88991e454110e8406bf247436bcca0ac12fcd1d867f2fda5741e71111b7611629e41a17f5fc12

data/lib/parallel.rb

@@ -246,6 +246,14 @@ module Parallel
       map(array, options.merge(:with_index => true), &block)
     end
 
+    def worker_number
+      Thread.current[:parallel_worker_number]
+    end
+
+    def worker_number=(worker_num)
+      Thread.current[:parallel_worker_number] = worker_num
+    end
+
     private
 
     def add_progress_bar!(job_factory, options)
@@ -274,6 +282,7 @@ module Parallel
     end
 
     def work_direct(job_factory, options, &block)
+      self.worker_number = 0
       results = []
       while set = job_factory.next
         item, index = set
@@ -282,6 +291,8 @@ module Parallel
         end
       end
       results
+    ensure
+      self.worker_number = nil
     end
 
     def work_in_threads(job_factory, options, &block)
@@ -290,7 +301,8 @@ module Parallel
       results_mutex = Mutex.new # arrays are not thread-safe on jRuby
       exception = nil
 
-      in_threads(options) do
+      in_threads(options) do |worker_num|
+        self.worker_number = worker_num
         # as long as there are more jobs, work on one of them
         while !exception && set = job_factory.next
           begin
@@ -365,13 +377,13 @@ module Parallel
 
       # create a new replacement worker
       running = workers - [worker]
-      workers[i] = worker(job_factory, options.merge(started_workers: running), &blk)
+      workers[i] = worker(job_factory, options.merge(started_workers: running, worker_number: i), &blk)
     end
 
     def create_workers(job_factory, options, &block)
       workers = []
-      Array.new(options[:count]).each do
-        workers << worker(job_factory, options.merge(:started_workers => workers), &block)
+      Array.new(options[:count]).each_with_index do |_, i|
+        workers << worker(job_factory, options.merge(started_workers: workers, worker_number: i), &block)
       end
       workers
     end
@@ -381,6 +393,8 @@ module Parallel
       parent_read, child_write = IO.pipe
 
       pid = Process.fork do
+        self.worker_number = options[:worker_number]
+
         begin
           options.delete(:started_workers).each(&:close_pipes)
 

data/lib/parallel/version.rb

@@ -1,3 +1,3 @@
 module Parallel
-  VERSION = Version = '1.8.0'
+  VERSION = Version = '1.9.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parallel
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 1.9.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-27 00:00:00.000000000 Z
+date: 2016-06-03 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: michael@grosser.it