parallel 0.8.4 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8dfa83f77faeb4b7a88c8fe48f4c4c761a698a79
-  data.tar.gz: b671b7078d94652f32c4d3926389ae49a8757ec2
+  metadata.gz: 6c50a58c0a8fadc833892eba309cad741926e435
+  data.tar.gz: 54c53c532e86976aa6e478a16a74216793929669
 SHA512:
-  metadata.gz: d2cf2bef92031948c03f45f6fae48637f16042ed84eaf97aa88894ac35e1db35fcd8e4e12b43819efdf8a9fccfc3af4aa23329808ac174935c8184a349ee1660
-  data.tar.gz: 5baf3578ead853ac7643d176ffcfd38e9f73a3c96c622e2af14517f0dbad756e85ae2b62b45582b9be32fae9d1c4e3c9309dfb2bf93fc546a15178baedf6adae
+  metadata.gz: 8cde8af228e3aa3b16be2d510de4332e61e6c569dd3dd927b8c87640b625fc8416962d9344a83e408578de14d5370d4b9b4c043a2e165cf395d9835be4c0f7e1
+  data.tar.gz: 342c63a9672f02c3b46cb30fffb72f646a98d49f3041611a128139a4ea4333b0c0143e2f0340577cec576a4b779fdd5aafcb58ec738078bd919b62506917fdb7

checksums.yaml.gz.sig

@@ -0,0 +1 @@
+���
�[ő6£�&�ɠ�

data/lib/parallel.rb

@@ -48,7 +48,7 @@ module Parallel
       begin
         Marshal.load(read)
       rescue EOFError
-        raise Parallel::DeadWorker
+        raise DeadWorker
       end
     end
   end
@@ -89,18 +89,26 @@ module Parallel
     def map(array, options = {}, &block)
       array = array.to_a # turn Range and other Enumerable-s into an Array
 
-      if options[:in_threads]
+      if RUBY_PLATFORM =~ /java/ and not options[:in_processes]
+        method = :in_threads
+        size = options[method] || processor_count
+      elsif options[:in_threads]
         method = :in_threads
         size = options[method]
       else
         method = :in_processes
-        size = options[method] || processor_count
+        if Process.respond_to?(:fork)
+          size = options[method] || processor_count
+        else
+          $stderr.puts "Warning: Process.fork is not supported by this Ruby"
+          size = 0
+        end
       end
       size = [array.size, size].min
 
-      return work_direct(array, options, &block) if size == 0
-
-      if method == :in_threads
+      if size == 0
+        work_direct(array, options, &block)
+      elsif method == :in_threads
         work_in_threads(array, options.merge(:count => size), &block)
       else
         work_in_processes(array, options.merge(:count => size), &block)
@@ -111,43 +119,80 @@ module Parallel
       map(array, options.merge(:with_index => true), &block)
     end
 
+    # Number of processors seen by the OS and used for process scheduling.
+    #
+    # * AIX: /usr/sbin/pmcycles (AIX 5+), /usr/sbin/lsdev
+    # * BSD: /sbin/sysctl
+    # * Cygwin: /proc/cpuinfo
+    # * Darwin: /usr/bin/hwprefs, /usr/sbin/sysctl
+    # * HP-UX: /usr/sbin/ioscan
+    # * IRIX: /usr/sbin/sysconf
+    # * Linux: /proc/cpuinfo
+    # * Minix 3+: /proc/cpuinfo
+    # * Solaris: /usr/sbin/psrinfo
+    # * Tru64 UNIX: /usr/sbin/psrinfo
+    # * UnixWare: /usr/sbin/psrinfo
+    #
     def processor_count
-      @processor_count ||= case RbConfig::CONFIG['host_os']
-      when /darwin9/
-        `hwprefs cpu_count`.to_i
-      when /darwin/
-        (hwprefs_available? ? `hwprefs thread_count` : `sysctl -n hw.ncpu`).to_i
-      when /linux|cygwin/
-        `grep -c ^processor /proc/cpuinfo`.to_i
-      when /(net|open|free)bsd/
-        `sysctl -n hw.ncpu`.to_i
-      when /mswin|mingw/
-        require 'win32ole'
-        wmi = WIN32OLE.connect("winmgmts://")
-        cpu = wmi.ExecQuery("select NumberOfLogicalProcessors from Win32_Processor")
-        cpu.to_enum.first.NumberOfLogicalProcessors
-      when /solaris2/
-        `psrinfo -p`.to_i # this is physical cpus afaik
-      else
-        $stderr.puts "Unknown architecture ( #{RbConfig::CONFIG["host_os"]} ) assuming one processor."
-        1
+      @processor_count ||= begin
+        os_name = RbConfig::CONFIG["target_os"]
+        if os_name =~ /mingw|mswin/
+          require 'win32ole'
+          result = WIN32OLE.connect("winmgmts://").ExecQuery(
+              "select NumberOfLogicalProcessors from Win32_Processor")
+          result.to_enum.collect(&:NumberOfLogicalProcessors).reduce(:+)
+        elsif File.readable?("/proc/cpuinfo")
+          IO.read("/proc/cpuinfo").scan(/^processor/).size
+        elsif File.executable?("/usr/bin/hwprefs")
+          IO.popen(%w[/usr/bin/hwprefs thread_count]).read.to_i
+        elsif File.executable?("/usr/sbin/psrinfo")
+          IO.popen("/usr/sbin/psrinfo").read.scan(/^.*on-*line/).size
+        elsif File.executable?("/usr/sbin/ioscan")
+          IO.popen(%w[/usr/sbin/ioscan -kC processor]) do |out|
+            out.read.scan(/^.*processor/).size
+          end
+        elsif File.executable?("/usr/sbin/pmcycles")
+          IO.popen(%w[/usr/sbin/pmcycles -m]).read.count("\n")
+        elsif File.executable?("/usr/sbin/lsdev")
+          IO.popen(%w[/usr/sbin/lsdev -Cc processor -S 1]).read.count("\n")
+        elsif File.executable?("/usr/sbin/sysconf") and os_name =~ /irix/i
+          IO.popen(%w[/usr/sbin/sysconf NPROC_ONLN]).read.to_i
+        elsif File.executable?("/usr/sbin/sysctl")
+          IO.popen(%w[/usr/sbin/sysctl -n hw.ncpu]).read.to_i
+        elsif File.executable?("/sbin/sysctl")
+          IO.popen(%w[/sbin/sysctl -n hw.ncpu]).read.to_i
+        else
+          $stderr.puts "Unknown platform: " + RbConfig::CONFIG["target_os"]
+          $stderr.puts "Assuming 1 processor."
+          1
+        end
       end
     end
 
+    # Number of physical processor cores on the current system.
+    #
     def physical_processor_count
       @physical_processor_count ||= begin
-        ppc = case RbConfig::CONFIG['host_os']
+        ppc = case RbConfig::CONFIG["target_os"]
         when /darwin1/
-          `sysctl -n hw.physicalcpu`.to_i
+          IO.popen(%w[/usr/sbin/sysctl -n hw.physicalcpu]).read.to_i
         when /linux/
-          cores_per_physical = `grep cores /proc/cpuinfo`[/\d+/].to_i
-          physicals = `grep 'physical id' /proc/cpuinfo |sort|uniq|wc -l`.to_i
-          physicals * cores_per_physical
+          cores = {}  # unique physical ID / core ID combinations
+          phy = 0
+          IO.read("/proc/cpuinfo").scan(/^physical id.*|^core id.*/) do |ln|
+            if ln.start_with?("physical")
+              phy = ln[/\d+/]
+            elsif ln.start_with?("core")
+              cid = phy + ":" + ln[/\d+/]
+              cores[cid] = true if not cores[cid]
+            end
+          end
+          cores.count
         when /mswin|mingw/
           require 'win32ole'
-          wmi = WIN32OLE.connect("winmgmts://")
-          cpu = wmi.ExecQuery("select NumberOfProcessors from Win32_Processor")
-          cpu.to_enum.first.NumberOfProcessors
+          result_set = WIN32OLE.connect("winmgmts://").ExecQuery(
+              "select NumberOfCores from Win32_Processor")
+          result_set.to_enum.collect(&:NumberOfCores).reduce(:+)
         else
           processor_count
         end
@@ -166,10 +211,6 @@ module Parallel
       results
     end
 
-    def hwprefs_available?
-      `which hwprefs` != ''
-    end
-
     def work_in_threads(items, options, &block)
       results = []
       current = -1

data/lib/parallel/version.rb

@@ -1,3 +1,3 @@
 module Parallel
-  VERSION = Version = '0.8.4'
+  VERSION = Version = '0.9.0'
 end

metadata

@@ -1,14 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: parallel
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 0.9.0
 platform: ruby
 authors:
 - Michael Grosser
 autorequire: 
 bindir: bin
-cert_chain: []
-date: 2013-09-26 00:00:00.000000000 Z
+cert_chain:
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIDMjCCAhqgAwIBAgIBADANBgkqhkiG9w0BAQUFADA/MRAwDgYDVQQDDAdtaWNo
+  YWVsMRcwFQYKCZImiZPyLGQBGRYHZ3Jvc3NlcjESMBAGCgmSJomT8ixkARkWAml0
+  MB4XDTEzMDIwMzE4MTMxMVoXDTE0MDIwMzE4MTMxMVowPzEQMA4GA1UEAwwHbWlj
+  aGFlbDEXMBUGCgmSJomT8ixkARkWB2dyb3NzZXIxEjAQBgoJkiaJk/IsZAEZFgJp
+  dDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMorXo/hgbUq97+kII9H
+  MsQcLdC/7wQ1ZP2OshVHPkeP0qH8MBHGg6eYisOX2ubNagF9YTCZWnhrdKrwpLOO
+  cPLaZbjUjljJ3cQR3B8Yn1veV5IhG86QseTBjymzJWsLpqJ1UZGpfB9tXcsFtuxO
+  6vHvcIHdzvc/OUkICttLbH+1qb6rsHUceqh+JrH4GrsJ5H4hAfIdyS2XMK7YRKbh
+  h+IBu6dFWJJByzFsYmV1PDXln3UBmgAt65cmCu4qPfThioCGDzbSJrGDGLmw/pFX
+  FPpVCm1zgYSb1v6Qnf3cgXa2f2wYGm17+zAVyIDpwryFru9yF/jJxE38z/DRsd9R
+  /88CAwEAAaM5MDcwCQYDVR0TBAIwADAdBgNVHQ4EFgQUsiNnXHtKeMYYcr4yJVmQ
+  WONL+IwwCwYDVR0PBAQDAgSwMA0GCSqGSIb3DQEBBQUAA4IBAQAlyN7kKo/NQCQ0
+  AOzZLZ3WAePvStkCFIJ53tsv5Kyo4pMAllv+BgPzzBt7qi605mFSL6zBd9uLou+W
+  Co3s48p1dy7CjjAfVQdmVNHF3MwXtfC2OEyvSQPi4xKR8iba8wa3xp9LVo1PuLpw
+  /6DsrChWw74HfsJN6qJOK684hJeT8lBYAUfiC3wD0owoPSg+XtyAAddisR+KV5Y1
+  NmVHuLtQcNTZy+gRht3ahJRMuC6QyLmkTsf+6MaenwAMkAgHdswGsJztOnNnBa3F
+  y0kCSWmK6D+x/SbfS6r7Ke07MRqziJdB9GuE1+0cIRuFh8EQ+LN6HXCKM5pon/GU
+  ycwMXfl0
+  -----END CERTIFICATE-----
+date: 2013-10-16 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: michael@grosser.it