threadify 0.0.3 → 1.0.0

data/README

@@ -16,7 +16,7 @@ URI
   http://rubyforge.org/projects/codeforpeople
 
 SAMPLES
-
+  
   <========< sample/a.rb >========>
 
   ~ > cat sample/a.rb
@@ -66,10 +66,22 @@ SAMPLES
 
   ~ > ruby sample/a.rb
 
+    /opt/local/lib/ruby/1.8/net/http.rb:560:in `initialize': getaddrinfo: nodename nor servname provided, or not known (SocketError)
+    	from /opt/local/lib/ruby/1.8/net/http.rb:560:in `open'
+    	from /opt/local/lib/ruby/1.8/net/http.rb:560:in `connect'
+    	from /opt/local/lib/ruby/1.8/timeout.rb:48:in `timeout'
+    	from /opt/local/lib/ruby/1.8/timeout.rb:76:in `timeout'
+    	from /opt/local/lib/ruby/1.8/net/http.rb:560:in `connect'
+    	from /opt/local/lib/ruby/1.8/net/http.rb:553:in `do_start'
+    	from /opt/local/lib/ruby/1.8/net/http.rb:542:in `start'
+    	from /opt/local/lib/ruby/1.8/open-uri.rb:242:in `open_http'
+    	 ... 8 levels...
+    	from sample/a.rb:21:in `each'
+    	from sample/a.rb:21
+    	from sample/a.rb:37:in `time'
+    	from sample/a.rb:20
     --- 
-    without threadify: 3.75206303596497
-    --- 
-    with threadify: 1.37899804115295
+    without threadify: 0.0373568534851074
 
 
   <========< sample/b.rb >========>
@@ -113,16 +125,20 @@ SAMPLES
   ~ > ruby sample/b.rb
 
     --- 
-    without threadify: 0.00630998611450195
+    without threadify: 0.00681805610656738
     --- 
-    with threadify: 0.270262956619263
+    with threadify: 0.57867693901062
     --- 
     :needle: 21844
     :a: 21844
     :b: 21844
 
 
+
 HISTORY
+  1.0.0
+    - adjust threadify to yield objects exactly like Enumerable#each
+
   0.0.3
     - added ability to short-circuit the parallel processing, a.k.a to 'break'
       from threadify

data/README.rb

@@ -0,0 +1,83 @@
+#! /usr/bin/env ruby
+
+template = <<-__
+  NAME
+    threadify.rb
+
+  SYNOPSIS
+    enumerable = %w( a b c d )
+    enumerable.threadify(2){ 'process this block using two worker threads' }
+
+  DESCRIPTION
+    threadify.rb makes it stupid easy to process a bunch of data using 'n'
+    worker threads
+
+  INSTALL
+    gem install threadify
+
+  URI
+    http://rubyforge.org/projects/codeforpeople
+
+  SAMPLES
+    <%= samples %>
+
+  HISTORY
+    1.0.0
+      - adjust threadify to yield objects exactly like Enumerable#each
+
+    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 ;-)
+__
+
+
+require 'erb'
+require 'pathname'
+
+$VERBOSE=nil
+
+def indent(s, n = 2)
+  s = unindent(s)
+  ws = ' ' * n
+  s.gsub(%r/^/, ws)
+end
+
+def unindent(s)
+  indent = nil
+  s.each do |line|
+    next if line =~ %r/^\s*$/
+    indent = line[%r/^\s*/] and break
+  end
+  indent ? s.gsub(%r/^#{ indent }/, "") : s
+end
+
+samples = ''
+prompt = '~ > '
+
+Dir.chdir(File.dirname(__FILE__))
+
+Dir['sample*/*'].sort.each do |sample|
+  samples << "\n" << "  <========< #{ sample } >========>" << "\n\n"
+
+  cmd = "cat #{ sample }" 
+  samples << indent(prompt + cmd, 2) << "\n\n" 
+  samples << indent(`#{ cmd }`, 4) << "\n" 
+
+  cmd = "ruby #{ sample }" 
+  samples << indent(prompt + cmd, 2) << "\n\n" 
+
+  cmd = "ruby -e'STDOUT.sync=true; exec %(ruby -Ilib #{ sample })'" 
+  #cmd = "ruby -Ilib #{ sample }" 
+  samples << indent(`#{ cmd } 2>&1`, 4) << "\n" 
+end
+
+erb = ERB.new(unindent(template))
+result = erb.result(binding)
+#open('README', 'w'){|fd| fd.write result}
+#puts unindent(result)
+puts result

data/gemspec.rb

@@ -1,35 +1,62 @@
-lib, version = File::basename(File::dirname(File::expand_path(__FILE__))).split %r/-/, 2
+#! /usr/bin/env ruby
 
-require 'rubygems'
+lib, version, *ignored = ARGV
 
-Gem::Specification::new do |spec|
-  $VERBOSE = nil
+unless lib
+  lib = File.basename(Dir.pwd)
+end
 
-  shiteless = lambda do |list|
-    list.delete_if do |file|
-      file =~ %r/\.svn/ or
-      file =~ %r/\.tmp/
-    end
-  end
+unless version
+  mod = lib.capitalize
+  require "./lib/#{ lib }"
+  version = eval(mod).send(:version)
+end
+
+abort('no lib') unless lib
+abort('no version') unless version
 
-  spec.name = lib 
-  spec.version = version 
-  spec.platform = Gem::Platform::RUBY
-  spec.summary = lib 
+puts "### gemspec: #{ lib }-#{ version }"
 
-  spec.files = shiteless[Dir::glob("**/**")]
-  spec.executables = shiteless[Dir::glob("bin/*")].map{|exe| File::basename exe}
-  
-  spec.require_path = "lib" 
+$VERBOSE = nil
 
-  spec.has_rdoc = File::exist? "doc" 
-  spec.test_suite_file = "test/#{ lib }.rb" if File::directory? "test"
-  #spec.add_dependency 'lib', '>= version'
+shiteless = lambda{|list| list.delete_if{|file| file =~ %r/\.(git|svn|tmp|sw.|bak)$/}}
 
-  spec.extensions << "extconf.rb" if File::exists? "extconf.rb"
+files       = shiteless[Dir::glob("**/**")]
+executables = shiteless[Dir::glob("bin/*")].map{|exe| File.basename(exe)}
+has_rdoc    = true #File.exist?('doc')
+test_files  = "test/#{ lib }.rb" if File.file?("test/#{ lib }.rb")
 
-  spec.rubyforge_project = 'codeforpeople'
-  spec.author = "Ara T. Howard"
-  spec.email = "ara.t.howard@gmail.com"
-  spec.homepage = "http://codeforpeople.com/lib/ruby/#{ lib }/"
+extensions = []
+%w( Makefile configure extconf.rb rakefile Rakefile mkrf_conf ).each do |ext|
+  extensions << ext if File.exists?(ext)
 end
+
+template = <<-__
+
+  Gem::Specification::new do |spec|
+    spec.name = #{ lib.inspect }
+    spec.version = #{ version.inspect }
+    spec.platform = Gem::Platform::RUBY
+    spec.summary = #{ lib.inspect }
+
+    spec.files = #{ files.inspect }
+    spec.executables = #{ executables.inspect }
+    
+    spec.require_path = "lib"
+
+    spec.has_rdoc = #{ has_rdoc.inspect }
+    spec.test_files = #{ test_files.inspect }
+    #spec.add_dependency 'lib', '>= version'
+    #spec.add_dependency 'fattr'
+
+    spec.extensions.push(*#{ extensions.inspect })
+
+    spec.rubyforge_project = 'codeforpeople'
+    spec.author = "Ara T. Howard"
+    spec.email = "ara.t.howard@gmail.com"
+    spec.homepage = "http://github.com/ahoward/#{ lib }/tree/master"
+  end
+
+__
+
+puts template

data/lib/threadify.rb

@@ -1,5 +1,5 @@
 module Threadify
-  VERSION = '0.0.3'
+  VERSION = '1.0.0'
   def Threadify.version() Threadify::VERSION end
 
   require 'thread'
@@ -16,7 +16,7 @@ module Threadify
 end
 
 module Enumerable
-  def threadify opts = {}, &block
+  def threadify(opts = {}, &block)
   # setup
   #
     opts = {:threads => opts} if Numeric === opts
@@ -29,13 +29,9 @@ module Enumerable
 
   # produce jobs
   #
-    #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
+    i = 0
+    each{|*args| jobs[i % threads].push([args, i]); i += 1}
+    threads.times{|i| jobs[i].push(done)}
 
   # setup consumer list
   #
@@ -107,17 +103,6 @@ module Enumerable
 
   # collect the results and return them
   #
-=begin
-    jobs.push done
-    ret = []
-    while((job = jobs.pop) != done)
-      elem, i, value = job
-      ret[i] = value
-    end
-    ret
-  end
-=end
-
     ret = []
     jobs.each do |results|
       results.each do |result|
@@ -132,13 +117,13 @@ module Enumerable
 end
 
 class Thread
-  def Thread.ify enumerable, *args, &block
+  def Thread.ify(enumerable, *args, &block)
     enumerable.send :threadify, *args, &block
   end
 end
 
 class Object
-  def threadify! *values
+  def threadify!(*values)
     throw :threadify, *values
   end
 end

data/threadify.gemspec

@@ -0,0 +1,26 @@
+### gemspec: threadify-1.0.0
+
+  Gem::Specification::new do |spec|
+    spec.name = "threadify"
+    spec.version = "1.0.0"
+    spec.platform = Gem::Platform::RUBY
+    spec.summary = "threadify"
+
+    spec.files = ["gemspec.rb", "install.rb", "lib", "lib/threadify.rb", "README", "README.rb", "sample", "sample/a.rb", "sample/b.rb", "threadify.gemspec"]
+    spec.executables = []
+    
+    spec.require_path = "lib"
+
+    spec.has_rdoc = true
+    spec.test_files = nil
+    #spec.add_dependency 'lib', '>= version'
+    #spec.add_dependency 'fattr'
+
+    spec.extensions.push(*[])
+
+    spec.rubyforge_project = 'codeforpeople'
+    spec.author = "Ara T. Howard"
+    spec.email = "ara.t.howard@gmail.com"
+    spec.homepage = "http://github.com/ahoward/threadify/tree/master"
+  end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: threadify
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 1.0.0
 platform: ruby
 authors: 
 - Ara T. Howard
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-07-11 00:00:00 -06:00
+date: 2009-06-02 00:00:00 -06:00
 default_executable: 
 dependencies: []
 
@@ -22,19 +22,18 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- a.rb
 - gemspec.rb
-- gen_readme.rb
 - install.rb
 - lib
 - lib/threadify.rb
-- lib/threadify.rb.bak
 - README
+- README.rb
 - sample
 - sample/a.rb
 - sample/b.rb
-has_rdoc: false
-homepage: http://codeforpeople.com/lib/ruby/threadify/
+- threadify.gemspec
+has_rdoc: true
+homepage: http://github.com/ahoward/threadify/tree/master
 post_install_message: 
 rdoc_options: []
 
@@ -55,7 +54,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: codeforpeople
-rubygems_version: 1.0.1
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: threadify

data/a.rb

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

data/gen_readme.rb

@@ -1,32 +0,0 @@
-require 'pathname'
-
-$VERBOSE=nil
-
-def indent s, n = 2
-  ws = ' ' * n
-  s.gsub %r/^/, ws 
-end
-
-template = IO::read 'README.tmpl'
-
-samples = ''
-prompt = '~ > '
-
-Dir['sample*/*'].sort.each do |sample|
-  samples << "\n" << "  <========< #{ sample } >========>" << "\n\n"
-
-  cmd = "cat #{ sample }" 
-  samples << indent(prompt + cmd, 2) << "\n\n" 
-  samples << indent(`#{ cmd }`, 4) << "\n" 
-
-  cmd = "ruby #{ sample }" 
-  samples << indent(prompt + cmd, 2) << "\n\n" 
-
-  cmd = "ruby -Ilib #{ sample }" 
-  samples << indent(`#{ cmd } 2>&1`, 4) << "\n" 
-end
-
-#samples.gsub! %r/^/, '  '
-
-readme  = template.gsub %r/^\s*@samples\s*$/, samples
-print readme 

data/lib/threadify.rb.bak

@@ -1,154 +0,0 @@
-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