stella 0.7.0.019 → 0.7.1

data/CHANGES.txt

@@ -1,7 +1,7 @@
 STELLA, CHANGES
 
 
-#### 0.7.0 (2009-10-??) ###############################
+#### 0.7.1 (2009-10-21) ###############################
 
 NOTE: Complete rewrite. Features include:
 

data/README.rdoc

@@ -1,6 +1,6 @@
 = Stella - 0.7 PREVIEW
 
-<b>Perform load tests on your web applications with beauty and brute strength.</b>
+<b>Blame Stella for breaking your web applications.</b>
 
 == Features
 
@@ -24,8 +24,8 @@ This is an early preview of Stella. The following features are still under devel
     # by running a single user functional test.
     $ stella verify -p examples/basic/plan.rb http://stellaaahhhh.com/
     
-    # Generate requests using the same test plan. 
-    $ stella generate -p examples/basic/plan.rb http://stellaaahhhh.com/
+    # Generate load using the same test plan. 
+    $ stella generate -p examples/basic/plan.rb -c 50 http://stellaaahhhh.com/
     
     
 == Test Plan Example
@@ -47,8 +47,8 @@ Test plans are defined in the Ruby programming language. This makes it possible
   
       get "/search", "Search Results" do
         wait 2..5
-        param :what  => 'Big Al'
-        param :where => 'Toronto'
+        param :what  => 'Sarsaparilla'
+        param :where => 'Lexington'
         response 200 do
           listing = doc.css('div.listing').first
           set :lid, listing['id'].match(/(\d+)/)[0]
@@ -99,7 +99,6 @@ Get it in one of the following ways:
 == Credits
 
 * Delano Mandelbaum (http://solutious.com)
-* Threadify (C) Ara T Howard (http://codeforpeople.com/)
 
 
 == Thanks 

data/Rudyfile

@@ -11,16 +11,19 @@ machines do
   
   env :stage do
                            
-    role :app do           
+    role :app do             
+      positions 2      
       user :root           
-      size 'm1.small'                    
+      size 'm1.small'              
     end                    
-                           
+  
     role :gen do
-      size 'm1.small'        
-    end                    
-
+      user :root
+      size 'm1.large'
+      ami 'ami-f0f61599'
+    end
   end  
+  
 
 end
 
@@ -36,6 +39,8 @@ commands do
   allow :thin
   allow :stella
   allow :rm
+  allow :ulimit
+  
   allow :rackup_path do
     "/usr/lib/ruby/gems/1.8/gems/stella-#{Stella::VERSION}/support/sample_webapp/config.ru"
   end
@@ -48,7 +53,11 @@ routines do
     # rudy -r app -v start
     start do
       remote do
-        thin :d, :l, 'thin.log', :p, 3114, :R, rackup_path, 'start'
+        ulimit :n, '30000'
+        ulimit :n
+        rm 'thin.log'
+        mkdir :p, 'stats'
+        thin :d, :l, 'thin.log', :p, 3114, :R, rackup_path, '--stats', './stats', '--max-conns', 8192, 'start'
       end
     end
     
@@ -61,10 +70,6 @@ routines do
       end
     end
     
-  end
-  
-  role :gen do
-    
     # rudy -v -r gen verify ip-10-251-27-245.ec2.internal:3114
     verify do
       remote do |arg|
@@ -75,13 +80,16 @@ routines do
     # rudy -v -r gen generate ip-10-251-27-245.ec2.internal:3114
     generate do
       remote do |arg|
-        stella :v, 'generate', :c, 200, :d, '30m', "#{arg.first}"
+        ulimit :n, '30000'
+        ulimit :n
+        stella :v, 'generate', :c, 200, :d, '10m', :W, "#{arg.first}"
       end
     end
     
   end
-  
-  setup do                     
+    
+  setup do  
+    before :startup                   
     after :sysupdate, :installdeps, :install_gem
   end                            
                                  
@@ -90,7 +98,11 @@ routines do
                                  
   reboot do                                             
   end
-    
+  
+  install_netperf do
+    #ftp://ftp.netperf.org/netperf/netperf-2.4.5.tar.bz2
+  end
+  
   install_rubyforge do
     remote :root do
       gem_install 'stella', :V
@@ -127,7 +139,6 @@ routines do
     
   end
   
-   
   installdeps do
     remote :root do
       gem_install "test-spec", "rspec", "camping", "fcgi", "memcache-client"
@@ -148,13 +159,14 @@ routines do
     end
   end
   
-  sysupdate do
-    remote :root do                  
+  sysupdate {
+    remote {
       apt_get "update"             
       apt_get "install", "libxml2-dev", "libxslt-dev"  
       apt_get "install", "build-essential", "git-core"
       apt_get "install", "ruby1.8-dev", "rdoc", "libzlib-ruby", "rubygems"
       apt_get "install", "libfcgi-dev", "libfcgi-ruby1.8"
+      apt_get "install", "joe", "siege", "httperf"
       gem_sources :a, "http://gems.github.com"
       mkdir :p, "/var/lib/gems/1.8/bin" # Doesn't get created, but causes Rubygems to fail
       gem_install "builder", "session"
@@ -162,8 +174,8 @@ routines do
       gem_install 'rubygems-update', "-v=1.3.4"
       update_rubygems
       gem_install 'hoe'
-    end
-  end
+    }
+  }
                            
   
 end

data/bin/stella

@@ -39,6 +39,7 @@ class Stella::CLI::Definition
   #global :A, :apikey, String, "API Key"
   #global :S, :secret, String, "Secret Key"
   global :p, :pause, Integer, "Seconds to pause before starting test"
+  global :E, :engine, String, "Specify a load engine (experimental)"
   global :n, :nocolor, "Disable output colors" do
     String.disable_color
   end
@@ -100,8 +101,6 @@ class Stella::CLI::Definition
   option :w, :wait, Float, "Wait time (in seconds) between client requests (ignored if testplan supplied)"
   option :p, :testplan, String, "Path to testplan" 
   command :generate => Stella::CLI
-#  command_alias :generate, :load 
-#  command_alias :generate, :stress 
 
   about "Initialize Stella configuration"
   command :init do

data/examples/essentials/plan.rb

@@ -77,7 +77,7 @@
 # Delano (@solutious.com) 
 #
 
-desc "Business Finder Testplan"
+desc "Product Finder"
 
 usecase 65, "Simple search" do
   

data/examples/exceptions/plan.rb

@@ -9,7 +9,7 @@ usecase "Exception Handling" do
   
   get "/search", "Search Results" do
     param :what  => 'No Such Listing'
-    param :where => random('Toronto', 'Montreal', 'Vancouver')
+    param :where => random(['Toronto', 'Montreal', 'Vancouver'])
     response 404 do
       raise NoSearchResults
     end

data/lib/stella.rb

@@ -14,10 +14,6 @@ autoload :Gibbler, 'gibbler/aliases'
 autoload :Attic, 'attic'
 
 require 'benelux'
-require 'threadify'
-require 'tracer'
-
-
 
 module Stella
   extend self

data/lib/stella/cli.rb

@@ -29,7 +29,15 @@ class Stella::CLI < Drydock::Command
     [:nowait, :clients, :repetitions, :duration].each do |opt|
       opts[opt] = @option.send(opt) unless @option.send(opt).nil?
     end
-    ret = Stella::Engine::Load.run @testplan, opts
+    
+    case @global.engine
+    when "package"
+      ret = Stella::Engine::LoadPackage.run @testplan, opts
+    when "create" 
+      ret = Stella::Engine::LoadCreate.run @testplan, opts
+    else 
+      ret = Stella::Engine::LoadQueue.run @testplan, opts
+    end
     @exit_code = (ret ? 0 : 1)
   end
   

data/lib/stella/engine.rb

@@ -60,15 +60,19 @@ module Stella::Engine
     def update_request_error(*args) raise end
     
   end
-
-  Stella::Utils.require_glob(STELLA_LIB_HOME, 'stella', 'engine', '*.rb')
-
-
+  
+  autoload :Functional, 'stella/engine/functional'
+  autoload :Load, 'stella/engine/loadbase'
+  autoload :LoadPackage, 'stella/engine/load_package'
+  autoload :LoadCreate, 'stella/engine/load_create'
+  autoload :LoadQueue, 'stella/engine/load_queue'
+  
   # These timers are interesting from a reporting perspective.
   Benelux.add_counter    Stella::Client, :execute_response_handler
   Benelux.add_timer          HTTPClient, :do_request
-  Benelux.add_timer HTTPClient::Session, :create_socket
-  Benelux.add_timer HTTPClient::Session, :create_ssl_socket
+  ## These are contained in connect
+  #Benelux.add_timer HTTPClient::Session, :create_socket
+  #Benelux.add_timer HTTPClient::Session, :create_ssl_socket
   Benelux.add_timer HTTPClient::Session, :connect
   Benelux.add_timer HTTPClient::Session, :query
   Benelux.add_timer HTTPClient::Session, :socket_gets_first_byte

data/lib/stella/engine/functional.rb

@@ -44,7 +44,9 @@ module Stella::Engine
     end
     
     def update_receive_response(client_id, usecase, uri, req, params, counter, container)
-      Stella.li '   %-59s %3d' % [uri, container.status]
+      msg = '   %-59s ' % [uri]
+      msg << container.status.to_s if Stella.loglev == 1
+      Stella.li msg
       
       Stella.li2 '   ' << container.response.request.header.send(:request_line)
       
@@ -58,6 +60,8 @@ module Stella::Engine
         Stella.li2 "     %s: %s" % pair
       end
       
+      Stella.li2 $/, "   Response-Status: %3d" % [container.status]
+      
       Stella.li2 $/, "   Response-Headers:"
       container.headers.all.each do |pair|
         Stella.li2 "     %s: %s" % pair

data/lib/stella/engine/load_create.rb

@@ -0,0 +1,84 @@
+
+module Stella::Engine
+  module LoadCreate
+    extend Stella::Engine::Base
+    extend Stella::Engine::Load
+    extend self
+    
+    
+    def execute_test_plan(packages, reps=1, duration=0)
+      time_started = Time.now
+
+      (1..reps).to_a.each { |rep|
+        @real_reps += 1  # Increments when duration is specified.
+        Stella.li3 "*** REPETITION #{@real_reps} of #{reps} ***"
+        packages.each { |package|
+          if running_threads.size <= packages.size
+            @threads << Thread.new do
+              c, uc = package.client, package.usecase
+              msg = "THREAD START: client %s: " % [c.digest.short] 
+              msg << "%s:%s (rep: %d)" % [uc.desc, uc.digest.short, @real_reps]
+              Stella.li4 $/, "======== " << msg
+              # This thread will stay on this one track. 
+              Benelux.current_track c.digest
+              Benelux.add_thread_tags :usecase => uc.digest_cache
+          
+              Benelux.add_thread_tags :rep =>  @real_reps
+              Stella::Engine::Load.rescue(c.digest_cache) {
+                break if Stella.abort?
+                print '.' if Stella.loglev == 2
+                stats = c.execute uc
+              }
+              Benelux.remove_thread_tags :rep
+              Benelux.remove_thread_tags :usecase
+            
+            end
+            Stella.sleep :create_thread
+          end
+          
+          if running_threads.size > @max_clients
+            @max_clients = running_threads.size
+          end
+          
+          if @mode == :rolling
+            tries = 0
+            while (reps > 1 || duration > 0) && running_threads.size >= packages.size
+              Stella.sleep :check_threads
+              msg = "#{running_threads.size} (max: #{@max_clients})"
+              Stella.li3 "*** RUNNING THREADS: #{msg} ***"
+              (tries += 1)
+            end
+          end
+        }
+        
+        if @mode != :rolling && running_threads.size > 0
+          args = [running_threads.size, @max_clients]
+          Stella.li3 "*** WAITING FOR %d THREADS TO FINISH (max: %d) ***" % args
+          @threads.each { |t| t.join } # wait
+        end
+        
+        # If a duration was given, we make sure 
+        # to run for only that amount of time.
+        # TODO: do not redo if 
+        # time_elapsed + usecase.mean > duration
+        if duration > 0
+          time_elapsed = (Time.now - time_started).to_i
+          msg = "#{time_elapsed} of #{duration} (threads: %d)" % running_threads.size
+          Stella.li3 "*** TIME ELAPSED: #{msg} ***"
+          redo if time_elapsed <= duration 
+          break if time_elapsed >= duration
+        end
+
+      }
+      
+      if @mode == :rolling && running_threads.size > 0
+        Stella.li3 "*** WAITING FOR THREADS TO FINISH ***"
+        @threads.each { |t| t.join } # wait
+      end
+      Stella.li2 $/, $/
+    end
+    
+    Benelux.add_timer Stella::Engine::LoadCreate, :execute_test_plan
+    
+  end
+end

data/lib/stella/engine/load_package.rb

@@ -0,0 +1,39 @@
+
+module Stella::Engine
+  module LoadPackage
+    extend Stella::Engine::Base
+    extend Stella::Engine::Load
+    extend self
+    
+    
+    def execute_test_plan(packages, reps=1,duration=0)
+      require 'threadify'
+      
+      Thread.ify packages, :threads => packages.size do |package|
+        Thread.current[:real_reps] = 0
+        # This thread will stay on this one track. 
+        Benelux.current_track package.client.gibbler
+        Benelux.add_thread_tags :usecase => package.usecase.digest_cache
+        (1..reps).to_a.each do |rep|
+          Thread.current[:real_reps] += 1
+          Benelux.add_thread_tags :rep =>  rep
+          Stella::Engine::Load.rescue(package.client.digest_cache) {
+            break if Stella.abort?
+            print '.' if Stella.loglev == 2
+            stats = package.client.execute package.usecase
+          }
+          Benelux.remove_thread_tags :rep
+          Stella.sleep :check_threads
+        end
+        
+        Benelux.remove_thread_tags :usecase
+        
+      end
+      
+      Stella.li2 $/, $/
+    end
+    
+    Benelux.add_timer Stella::Engine::LoadPackage, :execute_test_plan
+    
+  end
+end

data/lib/stella/engine/load_queue.rb

@@ -0,0 +1,85 @@
+
+module Stella::Engine
+  module LoadQueue
+    extend Stella::Engine::Base
+    extend Stella::Engine::Load
+    extend self
+    
+    def execute_test_plan(packages, reps=1,duration=0)
+      time_started = Time.now
+      
+      pqueue = Queue.new
+      packages.each { |p| pqueue << p  }
+      
+      @real_reps += 1  # Increments when duration is specified.
+      @threads = []
+      packages.size.times {
+        @max_clients += 1
+        @threads << Thread.new do
+          package = pqueue.pop
+          Thread.current[:real_reps] = 0
+          Thread.current[:real_uctime] = Benelux::Stats::Calculator.new
+          c, uc = package.client, package.usecase
+          Stella.li4 $/, "======== THREAD %s: START" % [c.digest.short]  
+
+          # This thread will stay on this one track. 
+          Benelux.current_track c.digest
+          Benelux.add_thread_tags :usecase => uc.digest_cache
+          
+          Thread.current[:real_uctime].first_tick
+          prev_ptime ||= Time.now
+          reps.times { |rep| 
+            break if Stella.abort?
+            Thread.current[:real_reps] += 1
+            args = [c.digest.short, uc.desc, uc.digest.short, Thread.current[:real_reps]]
+            Stella.li4 $/, "======== THREAD %s: %s:%s (rep: %d)" % args
+            
+            Benelux.add_thread_tags :rep =>  rep
+            #Stella.li [package.client.gibbler.shorter, package.usecase.gibbler.shorter, rep].inspect
+            Stella::Engine::Load.rescue(c.digest_cache) {
+              break if Stella.abort?
+              print '.' if Stella.loglev == 2
+              stats = c.execute uc
+            }
+            Benelux.remove_thread_tags :rep
+            
+            Thread.current[:real_uctime].tick
+            time_elapsed = (Time.now - time_started).to_i
+            
+            if Stella.loglev >= 2 &&
+               Thread.current == @threads.first && 
+              (Time.now - prev_ptime).to_i >= 5
+              prev_ptime, ruct = Time.now, Thread.current[:real_uctime]
+              args = [time_elapsed.to_i, ruct.n, ruct.mean, ruct.sd]
+              Stella.li2 $/, "REAL UC TIME: %ds (reps: %d): %.4fs %.4f(SD)" % args
+              Stella.lflush
+            end
+            
+            # If a duration was given, we make sure 
+            # to run for only that amount of time.
+            if duration > 0
+              break if (time_elapsed+Thread.current[:real_uctime].mean) >= duration
+              redo if (time_elapsed+Thread.current[:real_uctime].mean) <= duration
+            end
+          }
+          
+          Benelux.remove_thread_tags :usecase
+          
+          pqueue << package  # return the package to the queue
+        end
+      }
+      
+      repscalc = Benelux::Stats::Calculator.new
+      @threads.each { |t| t.join } # wait
+      @threads.each { |t| repscalc.sample(t[:real_reps]) }
+      @real_reps = repscalc.mean.to_i
+      
+      #Stella.li "*** REPETITION #{@real_reps} of #{reps} ***"
+      
+      Stella.li2 $/, $/
+    end
+    
+    Benelux.add_timer Stella::Engine::LoadQueue, :execute_test_plan
+    
+  end
+end

data/lib/stella/engine/{load.rb → loadbase.rb}

@@ -13,9 +13,10 @@ module Stella::Engine
     
     def run(plan, opts={})
       opts = process_options! plan, opts
+      @threads, @max_clients, @real_reps = [], 0, 0
       
       if Stella.loglev > 1
-        Load.timers += [:connect, :create_socket, :query, :socket_gets_first_byte, :get_body]
+        Load.timers += [:query, :connect, :socket_gets_first_byte, :get_body]
         Load.counts  = [:request_header_size, :request_content_size]
         Load.counts += [:response_headers_size, :response_content_size]
       end
@@ -42,35 +43,37 @@ module Stella::Engine
       rescue Interrupt
         Stella.li "Stopping test...", $/
         Stella.abort!
+        @threads.each { |t| t.join } unless @threads.nil? || @threads.empty? # wait
       ensure
         Stella.li "Processing statistics...", $/
         Stella.lflush
         
-        wait_for_reporter
-        
+        Benelux.update_global_timeline
+
+        bt = Benelux.timeline
         tt = Benelux.thread_timeline
-        test_time = tt.stats.group(:execute_test_plan).mean
         
+        test_time = tt.stats.group(:execute_test_plan).mean
         generate_report plan, test_time
+        report_time = tt.stats.group(:generate_report).mean
         
-        #p Benelux.timeline
+        # Here is the calcualtion for the number of
+        # Benelux assets created for each request:
+        # 
+        #     [5*2*REQ+6, 5*1*REQ+3, 13*REQ]
+        # 
         
         Stella.li "Summary: "
         Stella.li "  max clients: %d" % @max_clients
         Stella.li "  repetitions: %d" % @real_reps
         Stella.li "    test time: %10.2fs" % test_time
-        Stella.li "    wait time: %10.2fs" % tt.stats.group(:wait_for_reporter).mean
-        Stella.li "    post time: %10.2fs" % tt.stats.group(:generate_report).mean
+        Stella.li "    post time: %10.2fs" % report_time
         Stella.li $/
       end
       
       # errors?
     end
     
-    def wait_for_reporter
-      Benelux.reporter.force_update
-    end
-    
   protected
     class ThreadPackage
       attr_accessor :index
@@ -119,78 +122,10 @@ module Stella::Engine
       packages.compact # TODO: Why one nil element sometimes?
     end
     
-    def execute_test_plan(packages, reps=1, duration=0)
-      time_started = Time.now
-      
-      @threads, @max_clients, @real_reps = [], 0, 0
-      (1..reps).to_a.each { |rep|
-        @real_reps += 1  # Increments when duration is specified.
-        Stella.li3 "*** REPETITION #{@real_reps} of #{reps} ***"
-        packages.each { |package|
-          if running_threads.size <= packages.size
-            @threads << Thread.new do
-              c, uc = package.client, package.usecase
-              msg = "THREAD START: client %s: " % [c.digest.short] 
-              msg << "%s:%s (rep: %d)" % [uc.desc, uc.digest.short, @real_reps]
-              Stella.li4 $/, "======== " << msg
-              # This thread will stay on this one track. 
-              Benelux.current_track c.digest
-              Benelux.add_thread_tags :usecase => uc.digest_cache
-          
-              Benelux.add_thread_tags :rep =>  @real_reps
-              Stella::Engine::Load.rescue(c.digest_cache) {
-                break if Stella.abort?
-                print '.' if Stella.loglev == 2
-                stats = c.execute uc
-              }
-              Benelux.remove_thread_tags :rep
-              Benelux.remove_thread_tags :usecase
-            
-            end
-            Stella.sleep :create_thread
-          end
-          
-          if running_threads.size > @max_clients
-            @max_clients = running_threads.size
-          end
-          
-          if @mode == :rolling
-            tries = 0
-            while (reps > 1 || duration > 0) && running_threads.size >= packages.size
-              Stella.sleep :check_threads
-              msg = "#{running_threads.size} (max: #{@max_clients})"
-              Stella.li3 "*** RUNNING THREADS: #{msg} ***"
-              (tries += 1)
-            end
-          end
-        }
-        
-        if @mode != :rolling && running_threads.size > 0
-          args = [running_threads.size, @max_clients]
-          Stella.li3 "*** WAITING FOR %d THREADS TO FINISH (max: %d) ***" % args
-          @threads.each { |t| t.join } # wait
-        end
-        
-        # If a duration was given, we make sure 
-        # to run for only that amount of time.
-        # TODO: do not redo if 
-        # time_elapsed + usecase.mean > duration
-        if duration > 0
-          time_elapsed = (Time.now - time_started).to_i
-          msg = "#{time_elapsed} of #{duration} (threads: %d)" % running_threads.size
-          Stella.li3 "*** TIME ELAPSED: #{msg} ***"
-          redo if time_elapsed <= duration 
-          break if time_elapsed >= duration
-        end
-
-      }
-      
-      if @mode == :rolling && running_threads.size > 0
-        Stella.li3 "*** WAITING FOR THREADS TO FINISH ***"
-        @threads.each { |t| t.join } # wait
-      end
-      Stella.li2 $/, $/
+    def execute_test_plan(*args)
+      raise "Override execute_test_plan method in #{self}"
     end
+    
     def running_threads
       @threads.select { |t| t.status }  # non-false status are still running
     end
@@ -330,12 +265,9 @@ module Stella::Engine
       Stella.li3 ex.backtrace
     end
     
-    
     Benelux.add_timer Stella::Engine::Load, :build_thread_package
-    Benelux.add_timer Stella::Engine::Load, :execute_test_plan
     Benelux.add_timer Stella::Engine::Load, :generate_report
-    Benelux.add_timer Stella::Engine::Load, :wait_for_reporter
-    
+        
   end
 end
 

data/lib/stella/testplan.rb

@@ -4,9 +4,11 @@ require 'stella/testplan/stats'
 module Stella
 class Testplan
   include Gibbler::Complex
+  extend Attic
+  
+  attic :base_path
   
   attr_accessor :usecases
-  attr_accessor :base_path
   attr_accessor :desc
   attr_reader :stats
   
@@ -67,7 +69,7 @@ class Testplan
     ratio, name = args[0], args[1] if args[0].is_a?(Numeric)
     ratio, name = args[1], args[0] if args[0].is_a?(String)
     uc = Stella::Testplan::Usecase.new
-    uc.base_path = @base_path
+    uc.base_path = self.base_path
     uc.instance_eval &blk
     uc.ratio, uc.desc = (ratio || -1).to_f, name
     @testplan_current_ratio += uc.ratio if uc.ratio > 0

data/lib/stella/version.rb

@@ -5,8 +5,8 @@ module Stella
     unless defined?(MAJOR)
       MAJOR = 0.freeze
       MINOR = 7.freeze
-      TINY  = 0.freeze
-      PATCH = '019'.freeze
+      TINY  = 1.freeze
+      PATCH = '001'.freeze
     end
     def self.to_s; [MAJOR, MINOR, TINY, PATCH].join('.'); end
     def self.to_f; self.to_s.to_f; end

data/stella.gemspec

@@ -1,8 +1,8 @@
 @spec = Gem::Specification.new do |s|
   s.name = "stella"
   s.rubyforge_project = 'stella'
-  s.version = "0.7.0.019"
-  s.summary = "Stella: Perform load tests on your web applications with beauty and brute strength."
+  s.version = "0.7.1"
+  s.summary = "Blame Stella for breaking your web applications."
   s.description = s.summary
   s.author = "Delano Mandelbaum"
   s.email = "delano@solutious.com"
@@ -15,9 +15,9 @@
   
   s.executables = %w[stella]
   
-  s.add_dependency 'benelux',    '>= 0.4.3'
+  s.add_dependency 'benelux',    '>= 0.5.0'
   s.add_dependency 'drydock',    '>= 0.6.8'
-  s.add_dependency 'gibbler',    '>= 0.7.0'
+  s.add_dependency 'gibbler',    '>= 0.7.1'
   s.add_dependency 'sysinfo',    '>= 0.7.0'
   s.add_dependency 'storable',   '>= 0.5.8'
   s.add_dependency 'nokogiri'
@@ -51,7 +51,10 @@
   lib/stella/data/http/response.rb
   lib/stella/engine.rb
   lib/stella/engine/functional.rb
-  lib/stella/engine/load.rb
+  lib/stella/engine/load_create.rb
+  lib/stella/engine/load_package.rb
+  lib/stella/engine/load_queue.rb
+  lib/stella/engine/loadbase.rb
   lib/stella/exceptions.rb
   lib/stella/guidelines.rb
   lib/stella/mixins.rb
@@ -73,6 +76,7 @@
   support/useragents.txt
   tryouts/01_numeric_mixins_tryouts.rb
   tryouts/12_digest_tryouts.rb
+  tryouts/proofs/thread_queue.rb
   vendor/httpclient-2.1.5.2/httpclient.rb
   vendor/httpclient-2.1.5.2/httpclient/auth.rb
   vendor/httpclient-2.1.5.2/httpclient/cacert.p7s

data/support/sample_webapp/app.rb

@@ -24,14 +24,15 @@ set :reload           => true
 set :max_listings     => 1000
 
 LISTINGS = [
-  { :id => 1000, :name => 'John West Smoked Oysters', :city => 'Toronto'  },
-  { :id => 1001, :name => 'Fire Town Lightning Rods', :city => 'Toronto'  },
-  { :id => 1002, :name => 'Oversized Pen and Ink Co', :city => 'Toronto'  },
-  { :id => 1003, :name => 'The Rathzenburg Brothers', :city => 'Toronto'  },
-  { :id => 1004, :name => 'Forever and Always Beads', :city => 'Montreal' },
-  { :id => 1005, :name => "Big Al's Flavour Country", :city => 'Montreal' },
-  { :id => 1006, :name => 'Big Time Furniture World', :city => 'Montreal' },
-  { :id => 1007, :name => 'High-End Keyboard Makers', :city => 'Montreal' }
+  { :id => 1000, :name => 'John West Smoked Oysters', :city => 'Toronto'   },
+  { :id => 1001, :name => 'Fire Town Lightning Rods', :city => 'Toronto'   },
+  { :id => 1002, :name => 'Oversized Pen and Ink Co', :city => 'Toronto'   },
+  { :id => 1003, :name => 'The Rathzenburg Brothers', :city => 'Toronto'   },
+  { :id => 1004, :name => 'Forever and Always Beads', :city => 'Montreal'  },
+  { :id => 1005, :name => "Big Al's Flavour Country", :city => 'Montreal'  },
+  { :id => 1006, :name => 'Big Time Furniture World', :city => 'Montreal'  },
+  { :id => 1007, :name => 'High-End Keyboard Makers', :city => 'Montreal'  },
+  { :id => 1009, :name => 'Sarsaparilla Making Bros', :city => 'Lexington' }
 ]
 
 set :listings => LISTINGS.clone
@@ -50,6 +51,7 @@ end
 
 get '/' do
   @title << " - Search"
+  #sleep 0.05
   erb :search_form
 end
 
@@ -141,6 +143,7 @@ before do
     @cookie[:location] = ''
     set :listings => LISTINGS.clone
   end
+  sleep 0.05 if params[:enablesleep]
   @cookie[:history].delete params[:what]
   @cookie[:history].unshift params[:what] unless blank?(params[:what])
   @cookie[:history].pop if @cookie[:history].size > 5

data/tryouts/proofs/thread_queue.rb

@@ -0,0 +1,21 @@
+require 'thread'
+
+queue = Queue.new
+
+producer = Thread.new do
+  5.times do |i|
+    sleep rand(i) # simulate expense
+    queue << i
+    puts "#{i} produced"
+  end
+end
+
+consumer = Thread.new do
+  5.times do |i|
+    value = queue.pop
+    sleep rand(i/2) # simulate expense
+    puts "consumed #{value}"
+  end
+end
+
+consumer.join

data/vendor/httpclient-2.1.5.2/httpclient.rb

@@ -1005,6 +1005,8 @@ private
 
   def do_get_header(req, res, sess)
     res.version, res.status, res.reason, headers = sess.get_header
+    ## NOTE: If you re-enable, investigate whether it 
+    ## should call Benelux.timeline.add_count instead
     #Benelux.thread_timeline.add_count :response_header_size, res.header
     headers.each do |key, value|
       res.header.add(key, value)

data/vendor/httpclient-2.1.5.2/httpclient/http.rb

@@ -456,8 +456,10 @@ module HTTP
           dev << header
         end
         
-        #Benelux.thread_timeline.add_count :data_sent, header_size, :type => :header
-        #Benelux.thread_timeline.add_count :data_sent, body_size, :type => :body
+        ## NOTE: If you re-enable, investigate whether it 
+        ## should call Benelux.timeline.add_count instead
+        ##Benelux.thread_timeline.add_count :data_sent, header_size, :type => :header
+        ##Benelux.thread_timeline.add_count :data_sent, body_size, :type => :body
         
         dev
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: stella
 version: !ruby/object:Gem::Version 
-  version: 0.7.0.019
+  version: 0.7.1
 platform: ruby
 authors: 
 - Delano Mandelbaum
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-13 00:00:00 -04:00
+date: 2009-10-21 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.4.3
+        version: 0.5.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: drydock
@@ -40,7 +40,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.7.0
+        version: 0.7.1
     version: 
 - !ruby/object:Gem::Dependency 
   name: sysinfo
@@ -72,7 +72,7 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
-description: "Stella: Perform load tests on your web applications with beauty and brute strength."
+description: Blame Stella for breaking your web applications.
 email: delano@solutious.com
 executables: 
 - stella
@@ -109,7 +109,10 @@ files:
 - lib/stella/data/http/response.rb
 - lib/stella/engine.rb
 - lib/stella/engine/functional.rb
-- lib/stella/engine/load.rb
+- lib/stella/engine/load_create.rb
+- lib/stella/engine/load_package.rb
+- lib/stella/engine/load_queue.rb
+- lib/stella/engine/loadbase.rb
 - lib/stella/exceptions.rb
 - lib/stella/guidelines.rb
 - lib/stella/mixins.rb
@@ -131,6 +134,7 @@ files:
 - support/useragents.txt
 - tryouts/01_numeric_mixins_tryouts.rb
 - tryouts/12_digest_tryouts.rb
+- tryouts/proofs/thread_queue.rb
 - vendor/httpclient-2.1.5.2/httpclient.rb
 - vendor/httpclient-2.1.5.2/httpclient/auth.rb
 - vendor/httpclient-2.1.5.2/httpclient/cacert.p7s
@@ -150,7 +154,7 @@ post_install_message:
 rdoc_options: 
 - --line-numbers
 - --title
-- "Stella: Perform load tests on your web applications with beauty and brute strength."
+- Blame Stella for breaking your web applications.
 - --main
 - README.rdoc
 require_paths: 
@@ -173,6 +177,6 @@ rubyforge_project: stella
 rubygems_version: 1.3.2
 signing_key: 
 specification_version: 3
-summary: "Stella: Perform load tests on your web applications with beauty and brute strength."
+summary: Blame Stella for breaking your web applications.
 test_files: []