parallel 1.6.0 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0f363b126a1d42e09e74864a71c940edaf139d79
-  data.tar.gz: a8976de6367828f3ef06b8eb81822515817b1afc
+  metadata.gz: 70d72f94264963ccffda50fb09447556b91cb288
+  data.tar.gz: 5941637ecb8f9252001ac5e73fee8abd038dddb9
 SHA512:
-  metadata.gz: 0a78ebb2abf7b12749b4ffb318eb70b8b04f00af516dcf438423080a26136bd2a87a097e9b593130294eaf4e9a1e97a754da7c8f7a7a46c7d7b84f5446bdd224
-  data.tar.gz: 3eb8871382f2669e89fecca80bc2dfe198c05df133795e55fd12bd283d0760d7a9c5035c2abc337431b57048647b343ea9022a3ca83bf4da875c53d8a47c3b0c
+  metadata.gz: 307b3c2200b61a209480844057b2778bd53c342af0ef63adb922daeb145ebeba0af27cf8fc826d90d126dca4e293b80c88fe8e7e496c7e91aea3dfb74e550a1f
+  data.tar.gz: b4a12fcac78745faa6027000375e4f395f9b478fe912d18baefdc584152198e3e97fba56020f8a7cfac0f66c59f8eb05ec65fd8019275e4a4bad3232ea4aaa07

data/lib/parallel.rb

@@ -99,10 +99,13 @@ module Parallel
       end
     end
 
+    # generate item that is sent to workers
+    # just index is faster + less likely to blow up with unserializable errors
     def pack(item, index)
       producer? ? [item, index] : index
     end
 
+    # unpack item that is sent to workers
     def unpack(data)
       producer? ? data : [@source[data], data]
     end
@@ -273,6 +276,7 @@ module Parallel
     def work_in_threads(job_factory, options, &block)
       raise "interrupt_signal is no longer supported for threads" if options[:interrupt_signal]
       results = []
+      results_mutex = Mutex.new # arrays are not thread-safe on jRuby
       exception = nil
 
       in_threads(options) do
@@ -280,9 +284,10 @@ module Parallel
         while !exception && set = job_factory.next
           begin
             item, index = set
-            results[index] = with_instrumentation item, index, options do
+            result = with_instrumentation item, index, options do
               call_with_index(item, index, options, &block)
             end
+            results_mutex.synchronize { results[index] = result }
           rescue StandardError => e
             exception = e
           end
@@ -295,6 +300,7 @@ module Parallel
     def work_in_processes(job_factory, options, &blk)
       workers = create_workers(job_factory, options, &blk)
       results = []
+      results_mutex = Mutex.new # arrays are not thread-safe
       exception = nil
 
       UserInterruptHandler.kill_on_ctrl_c(workers.map(&:pid), options) do
@@ -309,9 +315,10 @@ module Parallel
               break unless index
 
               begin
-                results[index] = with_instrumentation item, index, options do
+                result = with_instrumentation item, index, options do
                   worker.work(job_factory.pack(item, index))
                 end
+                results_mutex.synchronize { results[index] = result } # arrays are not threads safe on jRuby
               rescue StandardError => e
                 exception = e
                 if Parallel::Kill === exception

data/lib/parallel/version.rb

@@ -1,3 +1,3 @@
 module Parallel
-  VERSION = Version = '1.6.0'
+  VERSION = Version = '1.6.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parallel
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.1
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-26 00:00:00.000000000 Z
+date: 2015-07-21 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: michael@grosser.it