threadify 0.0.2 → 0.0.3

data/README

@@ -1,7 +1,6 @@
 NAME
   threadify.rb
 
-
 SYNOPSIS
   enumerable = %w( a b c d )
   enumerable.threadify(2){ 'process this block using two worker threads' }
@@ -68,7 +67,67 @@ SAMPLES
   ~ > ruby sample/a.rb
 
     --- 
-    without threadify: 7.41900205612183
+    without threadify: 3.75206303596497
     --- 
-    with threadify: 3.69886112213135
+    with threadify: 1.37899804115295
+
+
+  <========< sample/b.rb >========>
+
+  ~ > cat sample/b.rb
+
+    require 'yaml'
+    
+    require 'rubygems'
+    require 'threadify'
+    
+    size = Integer(ARGV.shift || (2 ** 15))
+    
+    haystack = Array.new(size){|i| i}
+    needle = 2 * (size / 3) 
+    
+    a, b = 4, 2
+    
+    time 'without threadify' do
+      a = haystack.each{|value| break value if value == needle}
+    end
+    
+    time 'with threadify' do
+      b = haystack.threadify(16){|value| threadify! value if value == needle}
+    end
+    
+    raise if a != b
+    
+    y :a => a, :b => b, :needle => needle
+    
+    BEGIN {
+      def time label
+        a = Time.now.to_f
+        yield
+      ensure
+        b = Time.now.to_f
+        y label => (b - a)
+      end
+    }
+
+  ~ > ruby sample/b.rb
+
+    --- 
+    without threadify: 0.00630998611450195
+    --- 
+    with threadify: 0.270262956619263
+    --- 
+    :needle: 21844
+    :a: 21844
+    :b: 21844
+
+
+HISTORY
+  0.0.3
+    - added ability to short-circuit the parallel processing, a.k.a to 'break'
+      from threadify
 
+  0.0.2
+    - don't use thread.exit, just let the thread die naturally
+    - add version to Threadify module
+    - comments ;-)

data/a.rb

@@ -0,0 +1,10 @@
+require 'threadify'
+
+a = Array.new(1024){|i| i}
+
+value =
+  a.threadify do |i|
+    threadify! i if i == 512 
+  end
+
+p value

data/lib/threadify.rb

@@ -1,5 +1,5 @@
 module Threadify
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
   def Threadify.version() Threadify::VERSION end
 
   require 'thread'
@@ -11,6 +11,8 @@ module Threadify
     attr_accessor :threads
     attr_accessor :abort_on_exception
   end
+
+  class Error < ::StandardError; end
 end
 
 module Enumerable
@@ -20,27 +22,69 @@ module Enumerable
     opts = {:threads => opts} if Numeric === opts
     threads = Integer(opts[:threads] || opts['threads'] || Threadify.threads)
     done = Object.new.freeze
-    jobs = Queue.new
+    nothing = done
+    #jobs = Array.new(threads).map{ Queue.new }
+    jobs = Array.new(threads).map{ [] }
+    top = Thread.current
 
   # produce jobs
   #
-    each_with_index{|elem, i| jobs.push [elem, i]}
-    threads.times{ jobs.push done} # mark the end
+    #producer = Thread.new do
+      #this = Thread.current
+      #this.abort_on_exception = Threadify.abort_on_exception
+
+      each_with_index{|args, i| jobs[i % threads].push([args, i])}
+      threads.times{|i| jobs[i].push(done)}
+    #end
 
-  # fire off consumers
+  # setup consumer list
   #
     consumers = Array.new threads 
 
+  # setup support for short-circuit bailout via 'throw :threadify'
+  #
+    thrownv = Hash.new
+    thrownq = Queue.new
+
+    caught = false
+
+    catcher = Thread.new do
+      loop do
+        thrown = thrownq.pop
+        break if thrown == done
+        i, thrown = thrown
+        thrownv[i] = thrown
+        caught = true
+      end
+    end
+
+  # fire off the consumers
+  #
     threads.times do |i|
-      consumers[i] = Thread.new do
+      consumers[i] = Thread.new(jobs[i]) do |jobsi|
         this = Thread.current
         this.abort_on_exception = Threadify.abort_on_exception
-        loop{
-          job = jobs.pop
-          break if job == done
-          args = job.first
-          jobs << (job << block.call(*args))
-        }
+    
+        job = nil
+
+        thrown =
+          catch(:threadify) do
+            loop{
+              break if caught
+              #job = jobsi.pop
+              job = jobsi.shift
+              break if job == done
+              args = job.first
+              jobsi << (job << block.call(*args))
+            }
+            nothing
+          end
+
+
+        unless nothing == thrown
+          args, i = job
+          thrownq.push [i, thrown]
+        end
       end
     end
 
@@ -48,8 +92,22 @@ module Enumerable
   #
     consumers.map{|t| t.join}
 
+  # nuke the catcher
+  #
+    thrownq.push done
+    catcher.join
+
+  # iff something(s) was thrown return the one which would have been thrown
+  # earliest in non-parallel execution
+  #
+    unless thrownv.empty?
+      key = thrownv.keys.sort.first
+      return thrownv[key]
+    end
+
   # collect the results and return them
   #
+=begin
     jobs.push done
     ret = []
     while((job = jobs.pop) != done)
@@ -58,6 +116,19 @@ module Enumerable
     end
     ret
   end
+=end
+
+    ret = []
+    jobs.each do |results|
+      results.each do |result|
+        break if result == done
+        elem, i, value = result
+        ret[i] = value
+      end
+    end
+    ret
+  end
+
 end
 
 class Thread
@@ -66,6 +137,12 @@ class Thread
   end
 end
 
+class Object
+  def threadify! *values
+    throw :threadify, *values
+  end
+end
+
 
 if __FILE__ == $0
   require 'open-uri'

data/lib/threadify.rb.bak

@@ -0,0 +1,154 @@
+module Threadify
+  VERSION = '0.0.3'
+  def Threadify.version() Threadify::VERSION end
+
+  require 'thread'
+
+  @threads = 8
+  @abort_on_exception = true
+
+  class << self
+    attr_accessor :threads
+    attr_accessor :abort_on_exception
+  end
+
+  class Error < ::StandardError; end
+end
+
+module Enumerable
+  def threadify opts = {}, &block
+  # setup
+  #
+    opts = {:threads => opts} if Numeric === opts
+    threads = Integer(opts[:threads] || opts['threads'] || Threadify.threads)
+    done = Object.new.freeze
+    nothing = done
+    jobs = Queue.new
+    top = Thread.current
+
+  # produce jobs
+  #
+    producer = Thread.new do
+      each_with_index{|args, i| jobs.push [args, i]}
+      threads.times{ jobs.push done}
+    end
+
+  # setup consumer list
+  #
+    consumers = Array.new threads 
+
+  # setup support for short-circuit bailout via 'throw :threadify'
+  #
+    thrownv = Hash.new
+    thrownq = Queue.new
+
+    caught = false
+
+    catcher = Thread.new do
+      loop do
+        thrown = thrownq.pop
+        break if thrown == done
+        i, thrown = thrown
+        thrownv[i] = thrown
+        caught = true
+      end
+    end
+
+  # fire off the consumers
+  #
+    threads.times do |i|
+      consumers[i] = 
+        Thread.new do
+          this = Thread.current
+          this.abort_on_exception = Threadify.abort_on_exception
+      
+          job = nil
+
+          thrown =
+            catch(:threadify) do
+              loop{
+                break if caught
+                job = jobs.pop
+                break if job == done
+                args = job.first
+                jobs << (job << block.call(*args))
+              }
+              nothing
+            end
+
+
+          unless nothing == thrown
+            args, i = job
+            thrownq.push [i, thrown]
+          end
+        end
+    end
+
+  # wait for consumers to finish
+  #
+    consumers.map{|t| t.join}
+
+  # nuke the catcher
+  #
+    thrownq.push done
+    catcher.join
+
+  # iff something(s) was thrown return the one which would have been thrown
+  # earliest in non-parallel execution
+  #
+    unless thrownv.empty?
+      key = thrownv.keys.sort.first
+      return thrownv[key]
+    end
+
+  # collect the results and return them
+  #
+    jobs.push done
+    ret = []
+    while((job = jobs.pop) != done)
+      elem, i, value = job
+      ret[i] = value
+    end
+    ret
+  end
+
+end
+
+class Thread
+  def Thread.ify enumerable, *args, &block
+    enumerable.send :threadify, *args, &block
+  end
+end
+
+class Object
+  def threadify! *values
+    throw :threadify, *values
+  end
+end
+
+
+if __FILE__ == $0
+  require 'open-uri'
+  require 'yaml'
+
+  uris = %w( http://google.com http://yahoo.com http://rubyforge.org/ http://ruby-lang.org)
+
+  Thread.ify uris, :threads => 3 do |uri|
+    body = open(uri){|pipe| pipe.read}
+    y uri => body.size
+  end
+end
+
+
+__END__
+
+sample output
+
+--- 
+http://yahoo.com: 9562
+--- 
+http://google.com: 6290
+--- 
+http://rubyforge.org/: 22352
+--- 
+http://ruby-lang.org: 9984

data/sample/b.rb

@@ -0,0 +1,33 @@
+require 'yaml'
+
+require 'rubygems'
+require 'threadify'
+
+size = Integer(ARGV.shift || (2 ** 15))
+
+haystack = Array.new(size){|i| i}
+needle = 2 * (size / 3) 
+
+a, b = 4, 2
+
+time 'without threadify' do
+  a = haystack.each{|value| break value if value == needle}
+end
+
+time 'with threadify' do
+  b = haystack.threadify(16){|value| threadify! value if value == needle}
+end
+
+raise if a != b
+
+y :a => a, :b => b, :needle => needle
+
+BEGIN {
+  def time label
+    a = Time.now.to_f
+    yield
+  ensure
+    b = Time.now.to_f
+    y label => (b - a)
+  end
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: threadify
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Ara T. Howard
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-07-01 00:00:00 -06:00
+date: 2008-07-11 00:00:00 -06:00
 default_executable: 
 dependencies: []
 
@@ -22,15 +22,17 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- a.rb
 - gemspec.rb
 - gen_readme.rb
 - install.rb
 - lib
 - lib/threadify.rb
+- lib/threadify.rb.bak
 - README
 - sample
 - sample/a.rb
-- threadify-0.0.2.gem
+- sample/b.rb
 has_rdoc: false
 homepage: http://codeforpeople.com/lib/ruby/threadify/
 post_install_message: