jobQueue 1.0.6 → 1.0.7

data/README.rdoc

@@ -6,9 +6,9 @@ This package contains jobQueue:
 
 jobQueue can do the following things:
 
-* Run shell commands
+* Run blocks, Procs and Lambdas
 * Run instance and class methods
-* Run Procs and Lambdas
+* Run shell commands
 * Respect user definded locks
 
 == Installation
@@ -25,7 +25,7 @@ JobQueue requires Ruby only, but versions 1.9.x are needed to make use of system
 
 == Usage
 
-=== Parallelize Ruby's procs, lambdas and things
+=== Parallelize Ruby's blocks, procs, lambdas and things
 
 Create a JobQueue with nThreads worker with:
 
@@ -33,6 +33,13 @@ Create a JobQueue with nThreads worker with:
 
 Use its push method to put in something to do
 
+* For blocks:
+    jq.push do
+      myObject.method0(...)
+      myObject.method1(...)
+      myObject.method3(...)
+    end
+
 * For procs and lambdas: 
     
     jp.push(myProc,arg0,arg1,...)
@@ -65,7 +72,7 @@ script on 10 threads, use:
   prun.rb -j 10 jobs.sh
 
 The '-j' switch is optional. Default is the maximum number of cores. The script
-accepts multiple files and processes one after another. Try '-h' dor documentation.
+accepts multiple files and processes one after another. Try '-h' for documentation.
 
 == Support, Issues, Bugs, ...
 
@@ -88,6 +95,6 @@ jobQueue use the BSD License
 
 Author::   Ralf Mueller <stark.dreamdetective@gmail.com>
 Requires:: Ruby 1.9 or later
-License::  Copyright 2011 by Ralf Mueller
+License::  Copyright 2011-2012 by Ralf Mueller
            Released under BSD-style license.  See the LICENSE
            file included in the distribution.

data/gemspec

@@ -2,7 +2,7 @@ require 'rubygems'
 
 spec = Gem::Specification.new do |s|
   s.name              = "jobQueue"
-  s.version           = '1.0.6'
+  s.version           = '1.0.7'
   s.platform          = Gem::Platform::RUBY
   s.bindir            = 'bin'
   s.files             = ["lib/jobqueue.rb","bin/prun.rb"] + ["gemspec","LICENSE","README.rdoc"]
@@ -15,7 +15,7 @@ spec = Gem::Specification.new do |s|
   s.extra_rdoc_files          = ["README.rdoc","LICENSE"]
   s.license           = "BSD"
   s.test_file         = "test/test_jobqueue.rb"
-  s.required_ruby_version = ">= 1.9"
+  s.required_ruby_version = ">= 1.8"
 end
 
 # vim:ft=ruby

data/lib/jobqueue.rb

@@ -59,11 +59,11 @@ class JobQueue
   def JobQueue.maxnumber_of_processors
     case RUBY_ENGINE
     when 'jruby'
-      return Runtime.getRuntime().availableProcessors().to_i
-      #  processors = java.lang.Runtime.getRuntime.availableProcessors
+      require 'java'
+      return java.lang.Runtime.getRuntime.availableProcessors
     when 'ironruby'
       return System::Environment.ProcessorCount
-    when 'ruby'
+    when 'ruby','rbx'
       case  RUBY_PLATFORM
       when /linux/
         return `cat /proc/cpuinfo | grep processor | wc -l`.to_i
@@ -93,6 +93,7 @@ class SystemJobs < JobQueue
     @threads = (1..@workers).map {|i|
       Thread.new(@queue,@debug) {|q,dbg|
         until ( q == ( task = q.deq ) )
+          warn task.first
           ret = IO.popen(task.first).read
           #puts ret if dbg
         end

data/test/test_jobqueue.rb

@@ -136,10 +136,12 @@ class TestJobQueue < Test::Unit::TestCase
     a.seth(1)
     assert_equal(2,a.h[1])
 
-    (0..1000).each {|i| @jq.push(fill,a.h,i) }
-    @jq.run
-    assert_not_equal(a.h.keys, a.h.keys.sort)
-    (0..20).each {|i| assert_equal(i,a.h[i])}
+    #(0..1000).each {|i| @jq.push(fill,a.h,i) }
+    #@jq.run
+    #assert_not_equal(a.h.keys, a.h.keys.sort)
+    #(0..20).each {|i|
+    #  assert_equal(i,a.h[i])
+    #}
     a.h.clear;assert_equal({},a.h)
  
     lock = Mutex.new
@@ -172,13 +174,16 @@ class TestJobQueue < Test::Unit::TestCase
     assert_equal(111,a.i)
 
     size = 100
+    (0..size).each {|i| a.h[i] = nil }
     (0..size).each {|i|
       @jq.push do
         a.h[i] = i*i
       end
     }
     @jq.run
-    (0..size).each {|i| assert_equal(i*i,a.h[i]) }
+    (0..size).each {|i| 
+      assert_equal(i*i,a.h[i])
+    }
   end
 
   def test_block_vs_method
@@ -187,11 +192,11 @@ class TestJobQueue < Test::Unit::TestCase
     # use blocks
     (0..size).each {|i|
       @jq.push do
-        a.h[i] = i*i
+        a.seth(i)
       end
     }
     @jq.run
-    (0..size).each {|i| assert_equal(i*i,a.h[i]) }
+    (0..size).each {|i| assert_equal(2*i,a.h[i]) }
     a.h.clear
 
     # use method
@@ -205,33 +210,34 @@ class TestJobQueue < Test::Unit::TestCase
     script = Tempfile.open("jobQueue")
     (1..8).each {|i| script << "date;echo #{i}; sleep 1\n" }
     script.close
-    #puts script.path
-    #puts IO.popen("cat "+script.path).read
+    filename = script.path
+    puts IO.popen("cat "+script.path).read
+    cmd = lambda {|np,script| "ruby -rubygems ./bin/prun.rb -d -j #{np} #{script}"}
 
     # test in debug mode
     tstart = Time.new
-    puts IO.popen("bin/prun.rb -d -j 4 #{script.path}").read
+    puts IO.popen(cmd[4,filename]).read
     tend = Time.new
     trun = tend - tstart
     assert(2.0 < trun,"Test (debug mode) runs to fast: #{trun}, lower limit 2")
     assert(trun < 3  ,"Test (debug mode) runs to slow: #{trun}, upper limit 3")
     # test in normal mode
     tstart = Time.new
-    puts IO.popen("bin/prun.rb -j 4 #{script.path}").read
+    puts IO.popen(cmd[4,filename]).read
     tend = Time.new
     trun = tend - tstart
     assert(2.0 < trun,"Test (normal mode) runs to fast: #{trun}, lower limit 2")
     assert(trun < 3  ,"Test (normal mode) runs to slow: #{trun}, upper limit 3")
     # with 8 threads
     tstart = Time.new
-    puts IO.popen("bin/prun.rb -d -j 8 #{script.path}").read
+    puts IO.popen(cmd[8,filename]).read
     tend = Time.new
     trun = tend - tstart
     assert(1.0 < trun,"Test (debug mode) runs to fast: #{trun}, lower limit 1")
     assert(trun < 2.0,"Test (debug mode) runs to slow: #{trun}, lower limit 2")
     # test in normal mode
     tstart = Time.new
-    puts IO.popen("bin/prun.rb -j 8 #{script.path}").read
+    puts IO.popen(cmd[8,filename]).read
     tend = Time.new
     trun = tend - tstart
     assert(1.0 < trun,"Test (debug mode) runs to fast: #{trun}, lower limit 1")
@@ -242,6 +248,54 @@ class TestJobQueue < Test::Unit::TestCase
     def test_init_without_args
       jq = JobQueue.new
       assert_equal(8,jq.workers)
+      jq = JobQueue.new(1)
+      assert_equal(1,jq.workers)
+    end
+    def test_bench_shortQueue
+      # rand()
+      runTimes = 5*10**6
+      # date
+      runTimes = 10**2
+
+      times = {}
+      #[1,2,3,4,6,8].each {|nworker|
+      [1,2,4].each {|nworker|
+        puts nworker
+        jq = JobQueue.new(nworker)
+        nworker.times {|i|
+          jq.push {
+            runTimes.times { system("date >/dev/null") }
+            #runTimes.times { rand() }
+          }
+        }
+        print "start ..."
+        start = Time.new
+        jq.run
+        times[nworker] = Time.new - start
+        puts
+      }
+      pp times
+    end
+    def test_bench_longQueue
+      runTimes = 10**5
+
+      times = {}
+      [1,2,4,8].each {|nworker|
+        puts nworker
+        jq = JobQueue.new(nworker)
+        nworker.times {|i|
+          runTimes.times {
+            #jq.push(Kernel,:rand)
+            jq.push {
+              rand()
+            }
+          }
+          start = Time.new
+          jq.run
+          times[nworker] = Time.new - start
+        }
+      }
+      pp times
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jobQueue
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-23 00:00:00.000000000 Z
+date: 2012-08-17 00:00:00.000000000 Z
 dependencies: []
 description: Run Shell commands or Ruby methods in parallel
 email: stark.dreamdetective@gmail.com
@@ -38,7 +38,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '1.9'
+      version: '1.8'
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -47,7 +47,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: Run Shell commands or Ruby methods in parallel