parallel 1.23.0 → 1.26.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b8bb887652e89a339de17f31e8482aec8664426b2b12eb11566779f53153a56
-  data.tar.gz: e5fa1401f5748de7216a6d973d1ca1a2af514caeaec1dacafb153d2a5538334d
+  metadata.gz: 404f38d083ffa4ed2163c3018f5243fe487b6154905afa83b59320380bd3629a
+  data.tar.gz: 832f558729b425fa3e2ad6b9a3d6418c44d0f4a2ecc180a398a28b2301cd5cab
 SHA512:
-  metadata.gz: 481a4b04da349a2eb88cdcab724dc3c47efe757dcb61889a3105d0097fb3255ff6283470f6c2bc636c1bd053e274516fddfa33f8d362e8208f6f57638864ca48
-  data.tar.gz: 9093769c22e258cb921c1ab6ead1c7083fcc1d315b7bc268dff807c0fe1c4468b4316171e5f837283d7387ecdb01284f55763b60912c4bce7548aa9c869cc57b
+  metadata.gz: 5947502dc01d242a8a1cef0e2133cc3df913107941f5ba5bd82032bda76de6358bc44e62848909a75f2bfa45c867ee099f454c2652555265d734a166c988d144
+  data.tar.gz: '08f69f6c82041f015dee319ccc42bb0b1e20fc3d58b4e4007c1636ce459a71b0625ebb3ec8c28549562c1ed3f99f4182da41d8741a42eeeb4a96cb51b9bff701'

data/lib/parallel/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Parallel
-  VERSION = Version = '1.23.0' # rubocop:disable Naming/ConstantName
+  VERSION = Version = '1.26.3' # rubocop:disable Naming/ConstantName
 end

data/lib/parallel.rb

@@ -24,7 +24,7 @@ module Parallel
     attr_reader :backtrace
 
     def initialize(original)
-      super "#{original.class}: #{original.message}"
+      super("#{original.class}: #{original.message}")
       @backtrace = original.backtrace
     end
   end
@@ -300,12 +300,12 @@ module Parallel
       map(array, options.merge(with_index: true), &block)
     end
 
-    def flat_map(*args, &block)
-      map(*args, &block).flatten(1)
+    def flat_map(...)
+      map(...).flatten(1)
     end
 
-    def filter_map(*args, &block)
-      map(*args, &block).compact
+    def filter_map(...)
+      map(...).compact
     end
 
     # Number of physical processor cores on the current system.
@@ -328,11 +328,7 @@ module Parallel
             end
             cores.count
           when /mswin|mingw/
-            require 'win32ole'
-            result_set = WIN32OLE.connect("winmgmts://").ExecQuery(
-              "select NumberOfCores from Win32_Processor"
-            )
-            result_set.to_enum.collect(&:NumberOfCores).reduce(:+)
+            physical_processor_count_windows
           else
             processor_count
           end
@@ -341,10 +337,10 @@ module Parallel
       end
     end
 
-    # Number of processors seen by the OS, used for process scheduling
+    # Number of processors seen by the OS or value considering CPU quota if the process is inside a cgroup,
+    # used for process scheduling
     def processor_count
-      require 'etc'
-      @processor_count ||= Integer(ENV['PARALLEL_PROCESSOR_COUNT'] || Etc.nprocessors)
+      @processor_count ||= Integer(ENV['PARALLEL_PROCESSOR_COUNT'] || available_processor_count)
     end
 
     def worker_number
@@ -358,8 +354,35 @@ module Parallel
 
     private
 
+    def physical_processor_count_windows
+      # Get-CimInstance introduced in PowerShell 3 or earlier: https://learn.microsoft.com/en-us/previous-versions/powershell/module/cimcmdlets/get-ciminstance?view=powershell-3.0
+      result = run(
+        'powershell -command "Get-CimInstance -ClassName Win32_Processor -Property NumberOfCores ' \
+        '| Select-Object -Property NumberOfCores"'
+      )
+      if !result || $?.exitstatus != 0
+        # fallback to deprecated wmic for older systems
+        result = run("wmic cpu get NumberOfCores")
+      end
+      if !result || $?.exitstatus != 0
+        # Bail out if both commands returned something unexpected
+        warn "guessing pyhsical processor count"
+        processor_count
+      else
+        # powershell: "\nNumberOfCores\n-------------\n            4\n\n\n"
+        # wmic:       "NumberOfCores  \n\n4              \n\n\n\n"
+        result.scan(/\d+/).map(&:to_i).reduce(:+)
+      end
+    end
+
+    def run(command)
+      IO.popen(command, &:read)
+    rescue Errno::ENOENT
+      # Ignore
+    end
+
     def add_progress_bar!(job_factory, options)
-      if progress_options = options[:progress]
+      if (progress_options = options[:progress])
         raise "Progressbar can only be used with array like items" if job_factory.size == Float::INFINITY
         require 'ruby-progressbar'
 
@@ -388,7 +411,7 @@ module Parallel
       results = []
       exception = nil
       begin
-        while set = job_factory.next
+        while (set = job_factory.next)
           item, index = set
           results << with_instrumentation(item, index, options) do
             call_with_index(item, index, options, &block)
@@ -411,7 +434,7 @@ module Parallel
       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
+        while !exception && (set = job_factory.next)
           begin
             item, index = set
             result = with_instrumentation item, index, options do
@@ -455,7 +478,7 @@ module Parallel
 
       # start
       ractors.dup.each do |ractor|
-        if set = job_factory.next
+        if (set = job_factory.next)
           item, index = set
           instrument_start item, index, options
           ractor.send [callback, item, index]
@@ -466,7 +489,7 @@ module Parallel
       end
 
       # replace with new items
-      while set = job_factory.next
+      while (set = job_factory.next)
         item_next, index_next = set
         done, (exception, result, item, index) = Ractor.select(*ractors)
         if exception
@@ -640,13 +663,46 @@ module Parallel
     end
 
     def instrument_finish(item, index, result, options)
-      return unless on_finish = options[:finish]
+      return unless (on_finish = options[:finish])
+      return instrument_finish_in_order(item, index, result, options) if options[:finish_in_order]
       options[:mutex].synchronize { on_finish.call(item, index, result) }
     end
 
+    # yield results in the order of the input items
+    # needs to use `options` to store state between executions
+    # needs to use `done` index since a nil result would also be valid
+    def instrument_finish_in_order(item, index, result, options)
+      options[:mutex].synchronize do
+        # initialize our state
+        options[:finish_done] ||= []
+        options[:finish_expecting] ||= 0 # we wait for item at index 0
+
+        # store current result
+        options[:finish_done][index] = [item, result]
+
+        # yield all results that are now in order
+        break unless index == options[:finish_expecting]
+        index.upto(options[:finish_done].size).each do |i|
+          break unless (done = options[:finish_done][i])
+          options[:finish_done][i] = nil # allow GC to free this item and result
+          options[:finish].call(done[0], i, done[1])
+          options[:finish_expecting] += 1
+        end
+      end
+    end
+
     def instrument_start(item, index, options)
-      return unless on_start = options[:start]
+      return unless (on_start = options[:start])
       options[:mutex].synchronize { on_start.call(item, index) }
     end
+
+    def available_processor_count
+      gem 'concurrent-ruby', '>= 1.3.4'
+      require 'concurrent-ruby'
+      Concurrent.available_processor_count.floor
+    rescue LoadError
+      require 'etc'
+      Etc.nprocessors
+    end
   end
 end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: parallel
 version: !ruby/object:Gem::Version
-  version: 1.23.0
+  version: 1.26.3
 platform: ruby
 authors:
 - Michael Grosser
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-18 00:00:00.000000000 Z
+date: 2024-08-16 00:00:00.000000000 Z
 dependencies: []
-description: 
+description:
 email: michael@grosser.it
 executables: []
 extensions: []
@@ -24,10 +24,10 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/grosser/parallel/issues
-  documentation_uri: https://github.com/grosser/parallel/blob/v1.23.0/Readme.md
-  source_code_uri: https://github.com/grosser/parallel/tree/v1.23.0
+  documentation_uri: https://github.com/grosser/parallel/blob/v1.26.3/Readme.md
+  source_code_uri: https://github.com/grosser/parallel/tree/v1.26.3
   wiki_uri: https://github.com/grosser/parallel/wiki
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -35,15 +35,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.4.10
+signing_key:
 specification_version: 4
 summary: Run any kind of code in parallel processes
 test_files: []