threadz 0.1.3 → 1.0.0.beta

data/CHANGELOG

@@ -1,3 +1,8 @@
+1.0.0.beta
+==========
+Removing rcov and jeweler dependencies, fixing rspec at 1.x, adding some
+documentation, bumping to 1.x major version.
+
 0.1.0
 =====
 Initial release

data/Gemfile

@@ -0,0 +1,5 @@
+source "http://rubygems.org"
+
+# Specify your gem's dependencies in threadz.gemspec
+gemspec
+gem "rake"

data/Gemfile.lock

@@ -0,0 +1,18 @@
+PATH
+  remote: .
+  specs:
+    threadz (1.0.0.beta)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    rake (0.9.2.2)
+    rspec (1.3.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  rake
+  rspec (~> 1.0)
+  threadz!

data/Rakefile

@@ -1,12 +1,10 @@
-# Adapted from the rake Rakefile.
-
 require 'rubygems'
 require 'rake/testtask'
-require 'rake/rdoctask'
-require 'rake/gempackagetask'
+require 'rdoc/task'
+require 'rubygems/package_task'
 require 'rubygems/source_info_cache'
 require 'spec/rake/spectask'
-
+require "bundler/gem_tasks"
 
 spec = Gem::Specification.load(File.join(File.dirname(__FILE__), 'threadz.gemspec'))
 
@@ -14,22 +12,6 @@ desc "Default Task"
 task 'default' => ['spec', 'rdoc']
 
 
-desc "If you're building from sources, run this task first to setup the necessary dependencies"
-task 'setup' do
-  windows = Config::CONFIG['host_os'] =~ /windows|cygwin|bccwin|cygwin|djgpp|mingw|mswin|wince/i
-  rb_bin = File.expand_path(Config::CONFIG['ruby_install_name'], Config::CONFIG['bindir'])
-  spec.dependencies.select { |dep| Gem::SourceIndex.from_installed_gems.search(dep).empty? }.each do |missing|
-    dep = Gem::Dependency.new(missing.name, missing.version_requirements)
-    spec = Gem::SourceInfoCache.search(dep, true, true).last
-    fail "#{dep} not found in local or remote repository!" unless spec
-    puts "Installing #{spec.full_name} ..."
-    args = [rb_bin, '-S', 'gem', 'install', spec.name, '-v', spec.version.to_s]
-    args.unshift('sudo') unless windows || ENV['GEM_HOME']
-    sh args.map{ |a| a.inspect }.join(' ')
-  end
-end
-
-
 desc "Run all test cases"
 task 'spec' do |task|
   exec 'spec -c -f n spec/*.rb spec/basic/*.rb'
@@ -57,80 +39,9 @@ task 'spec-stress', [:times] do |task, args|
   puts "Done!"
 end
 
-# Create the documentation.
 Rake::RDocTask.new do |rdoc|
   rdoc.main = 'README.rdoc'
   rdoc.rdoc_files.include('README.rdoc', 'lib/**/*.rb')
   rdoc.title = "Threadz Thread Pool"
   rdoc.rdoc_dir = 'doc'
 end
-
-
-gem = Rake::GemPackageTask.new(spec) do |pkg|
-  pkg.need_tar = true
-  pkg.need_zip = true
-end
-
-desc "Install the package locally"
-task 'install'=>['setup', 'package'] do |task|
-  rb_bin = File.expand_path(Config::CONFIG['ruby_install_name'], Config::CONFIG['bindir'])
-  args = [rb_bin, '-S', 'gem', 'install', "pkg/#{spec.name}-#{spec.version}.gem"]
-  windows = Config::CONFIG['host_os'] =~ /windows|cygwin|bccwin|cygwin|djgpp|mingw|mswin|wince/i
-  args.unshift('sudo') unless windows || ENV['GEM_HOME']
-  sh args.map{ |a| a.inspect }.join(' ')
-end
-
-desc "Uninstall previously installed packaged"
-task 'uninstall' do |task|
-  rb_bin = File.expand_path(Config::CONFIG['ruby_install_name'], Config::CONFIG['bindir'])
-  args = [rb_bin, '-S', 'gem', 'install', spec.name, '-v', spec.version.to_s]
-  windows = Config::CONFIG['host_os'] =~ /windows|cygwin|bccwin|cygwin|djgpp|mingw|mswin|wince/i
-  args.unshift('sudo') unless windows || ENV['GEM_HOME']
-  sh args.map{ |a| a.inspect }.join(' ')
-end
-
-
-task 'release'=>['setup', 'test', 'package'] do
-
-  require 'rubyforge'
-  changes = File.read('CHANGELOG')[/\d+.\d+.\d+.*\n((:?^[^\n]+\n)*)/]
-  File.open '.changes', 'w' do |file|
-    file.write changes
-  end
-
-  puts "Uploading #{spec.name} #{spec.version}"
-  files = Dir['pkg/*.{gem,tgz,zip}']
-  rubyforge = RubyForge.new
-  rubyforge.configure
-  rubyforge.login
-  rubyforge.userconfig.merge! 'release_changes'=>'.changes', 'preformatted'=>true
-  rubyforge.add_release spec.rubyforge_project.downcase, spec.name.downcase, spec.version.to_s, *files
-  rm_f '.changes'
-  puts "Release #{spec.version} uploaded"
-end
-
-task 'clobber' do
-  rm_f '.changes'
-end
-
-desc "Run all examples with RCov"
-Spec::Rake::SpecTask.new('spec:rcov') do |t|
-  t.spec_files = FileList['spec/**/*.rb']
-  t.rcov = true
-  t.rcov_opts = ['--exclude', 'spec']
-end
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gemspec|
-    gemspec.name = "threadz"
-    gemspec.summary = "An easy Ruby threadpool library."
-    gemspec.description = "A Ruby threadpool library to handle threadpools and make batch jobs easier."
-    gemspec.email = "nanodeath@gmail.com"
-    gemspec.homepage = "http://github.com/nanodeath/threadz"
-    gemspec.authors = ["Max Aller"]
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler not available.  Install it with: sudo gem install jeweler"
-end

data/lib/threadz.rb

@@ -19,5 +19,17 @@
 
 require 'thread'
 
+require "threadz/version"
+
+module Threadz
+  DEBUG = ENV['THREADZ_DEBUG'] == "1"
+  
+  def Threadz.dputs(string)
+    puts(string) if DEBUG
+  end
+end
+
+Threadz::dputs("Loading threadz")
+
 ['atomic_integer', 'sleeper', 'directive', 'batch', 'thread_pool'].each { |lib| require File.join(File.dirname(__FILE__), 'threadz', lib) }
 

data/lib/threadz/thread_pool.rb

@@ -5,11 +5,11 @@ module Threadz
   # The ThreadPool class contains all the threads available to whatever context
   # has access to it.
   class ThreadPool
-    # Default setting for kill threshold
+    # Default setting for kill threshold: 10
     KILL_THRESHOLD = 10
-    # Setting for how much to decrement current kill score by for each queued job
+    # Setting for how much to decrement current kill score by for each queued job: 1
     THREADS_BUSY_SCORE = 1
-    # Setting for how much to increment current kill score by for *each* idle thread
+    # Setting for how much to increment current kill score by for *each* idle thread: 1
     THREADS_IDLE_SCORE = 1
 
     # Creates a new thread pool into which you can queue jobs.
@@ -24,6 +24,12 @@ module Threadz
     #                   pool is checked.  If there is more than one idle thread (and we're above minimum size), the
     #                   kill score is incremented by THREADS_IDLE_SCORE for each idle thread.  If there are no idle threads
     #                   (and we're below maximum size) the kill score is decremented by THREADS_KILL_SCORE for each queued job.
+    #                   If the thread pool is being perfectly utilized (no queued work or idle workers), the kill score will decay
+    #                   and lose 10% of its value.
+    #                   In the default case of kill_threshold=10, if the thread pool is overworked for 10 consecutive checks (that is,
+    #                   1 second), a new thread will be created and the counter reset.  Similarly, if the thread pool is underutilized
+    #                   for 10 consecutive checks, an idle thread will be culled.  If you want the thread pool to scale more quickly with
+    #                   demand, try lowering the kill_threshold value.
     def initialize(opts={})
       @min_size = opts[:initial_size] || 10 # documented
       @max_size = opts[:maximum_size] || @min_size * 5 # documented
@@ -45,8 +51,9 @@ module Threadz
     # Push a process onto the job queue for the thread pool to pick up.
     # Note that using this method, you can't keep track of when the job
     # finishes.  If you care about when it finishes, use batches.
-    def process(&block)
-      @queue << block
+    def process(callback = nil, &block)
+      callback ||= block
+      @queue << callback
       nil
     end
 
@@ -110,10 +117,10 @@ module Threadz
             @killscore > 0 ? kill_thread : spawn_thread
             @killscore = 0
           end
-          puts "killscore: #{@killscore}. waiting: #{@queue.num_waiting}.  threads length: #{@worker_threads_count.value}.  min/max: [#{@min_size}, #{@max_size}]" if $DEBUG
+          Threadz.dputs "killscore: #{@killscore}. waiting: #{@queue.num_waiting}.  threads length: #{@worker_threads_count.value}.  min/max: [#{@min_size}, #{@max_size}]"
           sleep 0.1
         end
       end
     end
   end
-end
+end

data/lib/threadz/version.rb

@@ -0,0 +1,4 @@
+module Threadz
+  VERSION = "1.0.0.beta"
+end
+  

data/spec/atomic_integer_spec.rb

@@ -7,16 +7,16 @@ describe Threadz do
 			# This test should always fail, but there is a small chance it won't...
 			
 			i = 0
-			n = 10_000
-			threads = 10
+			n = 100_000
+			threads = 100
 			t = []
 			threads.times do
 				t << Thread.new do
-					sleep 0.05
+					sleep 0.1
 					n.times { i += 1 }
 				end
 				t << Thread.new do 
-					sleep 0.05
+					sleep 0.1
 					n.times { i -= 1 }
 				end
 			end

data/spec/threadz_spec.rb

@@ -7,7 +7,7 @@ describe Threadz do
       @T = Threadz::ThreadPool.new
     end
 
-    it "should support process" do
+    it "should support process and accept a block" do
       i = 0
       3.times do
         @T.process { i += 1}
@@ -17,12 +17,37 @@ describe Threadz do
       i.should == 3
     end
 
+    it "should support process and accept an arg that responds to :call" do
+      i = 0
+      3.times do
+        @T.process(Proc.new { i += 1} )
+      end
+      sleep 0.1
+
+      i.should == 3
+    end
+
     it "should support creating batches" do
       i = 0
 
       lambda { @T.new_batch }.should_not raise_error
       lambda { @T.new_batch(:latent => true) }.should_not raise_error
     end
+    
+    it "should not crash when killing threads" do
+        i = 0
+        b = @T.new_batch(:latent => true)
+        5000.times do
+          b << lambda { i += 1 }
+          b << lambda { i -= 1 }
+          b << [lambda { i += 2}, lambda { i -= 1}]
+        end
+
+        b.start
+        b.wait_until_done
+
+		50.times { sleep 0.1 }
+    end
 
     describe Threadz::Batch do
       it "should support jobs" do
@@ -195,4 +220,4 @@ describe Threadz do
       end
     end
   end
-end
+end

data/threadz.gemspec

@@ -1,61 +1,22 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "threadz/version"
 
 Gem::Specification.new do |s|
-  s.name = %q{threadz}
-  s.version = "0.1.3"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Max Aller"]
-  s.date = %q{2010-02-01}
+  s.name        = "threadz"
+  s.version     = Threadz::VERSION
+  s.authors     = ["Max Aller"]
+  s.email       = ["nanodeath@gmail.com"]
+  s.homepage    = "http://github.com/nanodeath/threadz"
+  s.summary     = %q{An easy Ruby threadpool library.}
   s.description = %q{A Ruby threadpool library to handle threadpools and make batch jobs easier.}
-  s.email = %q{nanodeath@gmail.com}
-  s.extra_rdoc_files = [
-    "README.rdoc"
-  ]
-  s.files = [
-    ".gitignore",
-     "CHANGELOG",
-     "MIT-LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "lib/threadz.rb",
-     "lib/threadz/atomic_integer.rb",
-     "lib/threadz/batch.rb",
-     "lib/threadz/directive.rb",
-     "lib/threadz/sleeper.rb",
-     "lib/threadz/thread_pool.rb",
-     "spec/atomic_integer_spec.rb",
-     "spec/basic/thread_pool_spec.rb",
-     "spec/performance/batch_spec.rb",
-     "spec/spec_helper.rb",
-     "spec/threadz_spec.rb",
-     "threadz.gemspec"
-  ]
-  s.homepage = %q{http://github.com/nanodeath/threadz}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
-  s.summary = %q{An easy Ruby threadpool library.}
-  s.test_files = [
-    "spec/atomic_integer_spec.rb",
-     "spec/threadz_spec.rb",
-     "spec/performance/batch_spec.rb",
-     "spec/spec_helper.rb",
-     "spec/basic/thread_pool_spec.rb"
-  ]
 
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+  s.rubyforge_project = "threadz"
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-    else
-    end
-  else
-  end
-end
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
 
+  s.add_development_dependency "rspec", "~> 1.0"
+end

metadata

@@ -1,76 +1,76 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: threadz
-version: !ruby/object:Gem::Version 
-  version: 0.1.3
+version: !ruby/object:Gem::Version
+  version: 1.0.0.beta
+  prerelease: 6
 platform: ruby
-authors: 
+authors:
 - Max Aller
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-02-01 00:00:00 -08:00
-default_executable: 
-dependencies: []
-
+date: 2011-12-22 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &74613530 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: *74613530
 description: A Ruby threadpool library to handle threadpools and make batch jobs easier.
-email: nanodeath@gmail.com
+email:
+- nanodeath@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
-- README.rdoc
-files: 
+extra_rdoc_files: []
+files:
 - .gitignore
 - CHANGELOG
+- Gemfile
+- Gemfile.lock
 - MIT-LICENSE
 - README.rdoc
 - Rakefile
-- VERSION
 - lib/threadz.rb
 - lib/threadz/atomic_integer.rb
 - lib/threadz/batch.rb
 - lib/threadz/directive.rb
 - lib/threadz/sleeper.rb
 - lib/threadz/thread_pool.rb
+- lib/threadz/version.rb
 - spec/atomic_integer_spec.rb
 - spec/basic/thread_pool_spec.rb
 - spec/performance/batch_spec.rb
 - spec/spec_helper.rb
 - spec/threadz_spec.rb
 - threadz.gemspec
-has_rdoc: true
 homepage: http://github.com/nanodeath/threadz
 licenses: []
-
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
-require_paths: 
+rdoc_options: []
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>'
+    - !ruby/object:Gem::Version
+      version: 1.3.1
 requirements: []
-
-rubyforge_project: 
-rubygems_version: 1.3.5
+rubyforge_project: threadz
+rubygems_version: 1.8.13
 signing_key: 
 specification_version: 3
 summary: An easy Ruby threadpool library.
-test_files: 
-- spec/atomic_integer_spec.rb
-- spec/threadz_spec.rb
-- spec/performance/batch_spec.rb
-- spec/spec_helper.rb
-- spec/basic/thread_pool_spec.rb
+test_files: []

data/VERSION

@@ -1 +0,0 @@
-0.1.3