stella 0.7.0.015 → 0.7.0.017

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: stella
 version: !ruby/object:Gem::Version 
-  version: 0.7.0.015
+  version: 0.7.0.017
 platform: ruby
 authors: 
 - Delano Mandelbaum
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-06 00:00:00 -04:00
+date: 2009-10-09 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.2
+        version: 0.4.3
     version: 
 - !ruby/object:Gem::Dependency 
   name: drydock
@@ -40,7 +40,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.6.3
+        version: 0.7.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: sysinfo
@@ -60,17 +60,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.5.7
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: httpclient
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 2.1.5
+        version: 0.5.8
     version: 
 - !ruby/object:Gem::Dependency 
   name: nokogiri
@@ -100,9 +90,11 @@ files:
 - Rudyfile
 - bin/stella
 - examples/cookies/plan.rb
+- examples/csvdata/plan.rb
+- examples/csvdata/search_terms.csv
 - examples/essentials/logo.png
 - examples/essentials/plan.rb
-- examples/essentials/search_terms.csv
+- examples/essentials/search_terms.txt
 - examples/exceptions/plan.rb
 - lib/stella.rb
 - lib/stella/cli.rb
@@ -118,12 +110,13 @@ files:
 - lib/stella/engine.rb
 - lib/stella/engine/functional.rb
 - lib/stella/engine/load.rb
-- lib/stella/engine/stress.rb
 - lib/stella/exceptions.rb
 - lib/stella/guidelines.rb
 - lib/stella/mixins.rb
 - lib/stella/mixins/numeric.rb
+- lib/stella/mixins/string.rb
 - lib/stella/mixins/thread.rb
+- lib/stella/mixins/time.rb
 - lib/stella/stats.rb
 - lib/stella/testplan.rb
 - lib/stella/testplan/stats.rb
@@ -136,6 +129,8 @@ files:
 - support/sample_webapp/app.rb
 - support/sample_webapp/config.ru
 - support/useragents.txt
+- tryouts/01_numeric_mixins_tryouts.rb
+- tryouts/12_digest_tryouts.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/lib/stella/engine/stress.rb

@@ -1,293 +0,0 @@
-
-module Stella::Engine
-  module Stress
-    extend Stella::Engine::Base
-    extend self
-    
-    @timers = [:do_request]
-    @counts = [:response_content_size]
-    
-    class << self
-      attr_accessor :timers, :counts
-    end
-    
-    def run(plan, opts={})
-      opts = {
-        :hosts          => [],
-        :clients        => 1,
-        :duration       => nil,
-        :repetitions    => 1
-      }.merge! opts
-      opts[:clients] = plan.usecases.size if opts[:clients] < plan.usecases.size
-      opts[:clients] = 1000 if opts[:clients] > 1000
-      
-      if Stella.loglev > 1
-        Stress.timers += [:connect, :create_socket, :query, :socket_gets_first_byte, :get_body]
-        Stress.counts  = [:request_header_size, :request_content_size]
-        Stress.counts += [:response_headers_size, :response_content_size]
-      end
-      
-      
-      Stella.ld "OPTIONS: #{opts.inspect}"
-      Stella.li3 "Hosts: " << opts[:hosts].join(', ') 
-      
-      counts = calculate_usecase_clients plan, opts
-      
-      Stella.li $/, "Preparing #{counts[:total]} virtual clients...", $/
-      Stella.lflush
-      packages = build_thread_package plan, opts, counts
-      
-      Stella.li "Generating load...", $/
-      Stella.lflush
-      
-      begin
-        execute_test_plan packages, opts[:repetitions]
-      rescue Interrupt
-        Stella.li "Stopping test...", $/
-        Stella.abort!
-      ensure
-        Stella.li "Processing statistics...", $/
-        Stella.lflush
-        
-        
-        wait_for_reporter
-        
-        tt = Benelux.thread_timeline
-        test_time = tt.ranges(:execute_test_plan).first.duration
-        
-        generate_report plan, test_time
-
-        # No need to add the main thread 
-        # stats to the global timeline. 
-        # Benelux.reporter.force_update
-        
-        Stella.li "Overall time: "
-        Stella.li "  prep: %10.2fs" % tt.ranges(:build_thread_package).first.duration
-        Stella.li "  test: %10.2fs" % test_time
-        Stella.li "  wait: %10.2fs" % tt.ranges(:wait_for_reporter).first.duration
-        Stella.li "  post: %10.2fs" % tt.ranges(:generate_report).first.duration
-        Stella.li $/
-      end
-      
-      # errors?
-    end
-    
-    def wait_for_reporter
-      Benelux.reporter.wait
-    end
-    
-  protected
-    class ThreadPackage
-      attr_accessor :index
-      attr_accessor :client
-      attr_accessor :usecase
-      def initialize(i, c, u)
-        @index, @client, @usecase = i, c, u
-      end
-    end
-    
-    def calculate_usecase_clients(plan, opts)
-      counts = { :total => 0 }
-      plan.usecases.each_with_index do |usecase,i|
-        count = case opts[:clients]
-        when 0..9
-          if (opts[:clients] % plan.usecases.size > 0) 
-            msg = "Client count does not evenly match usecase count"
-            raise Stella::Testplan::WackyRatio, msg
-          else
-            (opts[:clients] / plan.usecases.size)
-          end
-        else
-          (opts[:clients] * usecase.ratio).to_i
-        end
-        counts[usecase.gibbler_cache] = count
-        counts[:total] += count
-      end
-      counts
-    end
-    
-    def build_thread_package(plan, opts, counts)
-      packages, pointer = Array.new(counts[:total]), 0
-      plan.usecases.each do |usecase|
-        count = counts[usecase.gibbler_cache]
-        Stella.ld "THREAD PACKAGE: #{usecase.desc} (#{pointer} + #{count})"
-        # Fill the thread_package with the contents of the block
-        packages.fill(pointer, count) do |index|
-          Stella.li3 "Creating client ##{index+1} "
-          client = Stella::Client.new opts[:hosts].first, index+1
-          client.add_observer(self)
-          client.enable_nowait_mode 
-          ThreadPackage.new(index+1, client, usecase)
-        end
-        pointer += count
-      end
-      packages.compact # TODO: Why one nil element sometimes?
-    end
-    
-    def execute_test_plan(packages, reps=1)
-      Thread.ify packages, :threads => packages.size do |package|
-        
-        # This thread will stay on this one track. 
-        Benelux.current_track package.client.gibbler
-        Benelux.add_thread_tags :usecase => package.usecase.gibbler_cache
-        
-        (1..reps).to_a.each do |rep|
-          Benelux.add_thread_tags :rep =>  rep
-          Stella::Engine::Stress.rescue(package.client.gibbler_cache) {
-            break if Stella.abort?
-            print '.' if Stella.loglev == 2
-            stats = package.client.execute package.usecase
-          }
-          Benelux.remove_thread_tags :rep
-        end
-        
-        Benelux.remove_thread_tags :usecase
-        
-      end
-      Stella.li2 $/, $/
-    end
-      
-    def generate_report(plan,test_time)
-      #Benelux.update_all_track_timelines
-      global_timeline = Benelux.timeline
-      
-      Stella.li $/, " %-72s  ".att(:reverse) % ["#{plan.desc}  (#{plan.gibbler_cache.shorter})"]
-      plan.usecases.uniq.each_with_index do |uc,i| 
-        
-        # TODO: Create Ranges object, like Stats object
-        # global_timeline.ranges(:do_request)[:usecase => '1111']
-        # The following returns globl do_request ranges. 
-        requests = 0 #global_timeline.ranges(:do_request).size
-        
-        desc = uc.desc || "Usecase ##{i+1} "
-        desc << "  (#{uc.gibbler_cache.shorter}) "
-        str = ' ' << " %-66s %s   %d%% ".bright.att(:reverse)
-        Stella.li str % [desc, '', uc.ratio_pretty]
-        
-        uc.requests.each do |req| 
-          filter = [uc.gibbler_cache, req.gibbler_cache]
-          desc = req.desc 
-          Stella.li "   %-72s ".bright % ["#{req.desc}  (#{req.gibbler_cache.shorter})"]
-          Stella.li "    %s" % [req.to_s]
-          Stress.timers.each do |sname|
-            stats = global_timeline.stats.group(sname)[filter]
-            str = '      %-30s %.3f <= ' << '%.3fs' << ' >= %.3f; %.3f(SD) %d(N)'
-            Stella.li str % [sname, stats.min, stats.mean, stats.max, stats.sd, stats.n]
-            Stella.lflush
-          end
-          Stella.li $/
-        end
-        
-        Stella.li "   Sub Total:".bright
-        
-        stats = global_timeline.stats.group(:do_request)[uc.gibbler_cache]
-        failed = global_timeline.stats.group(:failed)[uc.gibbler_cache]
-        respgrp = global_timeline.stats.group(:execute_response_handler)[uc.gibbler_cache]
-        resst = respgrp.tag_values(:status)
-        statusi = []
-        resst.each do |status|
-          size = respgrp[:status => status].size
-          statusi << "#{status}: #{size}"
-        end
-        Stella.li '      %-30s %d (%s)' % ['Total requests', stats.n, statusi.join(', ')]
-        Stella.li '       %-29s %d' % [:success, stats.n - failed.n]
-        Stella.li '       %-29s %d' % [:failed, failed.n]
-        
-        Stress.timers.each do |sname|
-          stats = global_timeline.stats.group(sname)[uc.gibbler_cache]
-          Stella.li '      %-30s %.3fs %.3f(SD)' % [sname, stats.mean, stats.sd]
-          Stella.lflush
-        end
-        
-        Stress.counts.each do |sname|
-          stats = global_timeline.stats.group(sname)[uc.gibbler_cache]
-          Stella.li '      %-30s %-12s (avg:%s)' % [sname, stats.sum.to_bytes, stats.mean.to_bytes]
-          Stella.lflush
-        end
-        Stella.li $/
-      end
-      
-      Stella.li ' ' << " %-66s ".att(:reverse) % 'Total:'
-      stats = global_timeline.stats.group(:do_request)
-      failed = global_timeline.stats.group(:failed)
-      respgrp = global_timeline.stats.group(:execute_response_handler)
-      resst = respgrp.tag_values(:status)
-      statusi = []
-      resst.each do |status|
-        size = respgrp[:status => status].size
-        statusi << [status, size]
-      end
-      Stella.li  '      %-30s %d' % ['Total requests', stats.n]
-      success = stats.n - failed.n
-      Stella.li  '       %-29s %d (req/s: %.2f)' % [:success, success, success/test_time]
-      statusi.each do |pair|
-        Stella.li2 '        %-28s %s: %d' % ['', *pair]
-      end
-      Stella.li  '       %-29s %d' % [:failed, failed.n]
-      
-      Stress.timers.each do |sname|
-        stats = global_timeline.stats.group(sname)
-        Stella.li '      %-30s %-.3fs     %-.3f(SD)' % [sname, stats.mean, stats.sd]
-        Stella.lflush
-      end
-      
-      Stress.counts.each do |sname|
-        stats = global_timeline.stats.group(sname)
-        Stella.li '      %-30s %-12s (avg:%s)' % [sname, stats.sum.to_bytes, stats.mean.to_bytes]
-        Stella.lflush
-      end
-      Stella.li $/
-    end
-    
-    
-    def update_prepare_request(client_id, usecase, req, counter)
-      
-    end
-      
-    def update_receive_response(client_id, usecase, uri, req, counter, container)
-      desc = "#{usecase.desc} > #{req.desc}"
-      Stella.li3 '  Client-%s %3d %-6s %-45s' % [client_id.shorter, container.status, req.http_method, uri]
-    end
-    
-    def update_execute_response_handler(client_id, req, container)
-    end
-    
-    def update_error_execute_response_handler(client_id, ex, req, container)
-      desc = "#{container.usecase.desc} > #{req.desc}"
-      Stella.li $/ if Stella.loglev == 1
-      Stella.le '  Client-%s %-45s %s' % [client_id.shorter, desc, ex.message]
-      Stella.li3 ex.backtrace
-    end
-    
-    def update_request_error(client_id, usecase, uri, req, params, ex)
-      desc = "#{usecase.desc} > #{req.desc}"
-      Stella.li $/ if Stella.loglev == 1
-      Stella.le '  Client-%s %-45s %s' % [client_id.shorter, desc, ex.message]
-      Stella.li3 ex.backtrace
-    end
-
-    def update_quit_usecase client_id, msg
-      Stella.li3 "  Client-%s     QUIT   %s" % [client_id.shorter, msg]
-    end
-    
-    
-    def update_repeat_request client_id, counter, total
-      Stella.li3 "  Client-%s     REPEAT   %d of %d" % [client_id.shorter, counter, total]
-    end
-    
-    def self.rescue(client_id, &blk)
-      blk.call
-    rescue => ex
-      Stella.le '  Error in Client-%s: %s' % [client_id.shorter, ex.message]
-      Stella.li3 ex.backtrace
-    end
-    
-    
-    Benelux.add_timer Stella::Engine::Stress, :build_thread_package
-    Benelux.add_timer Stella::Engine::Stress, :execute_test_plan
-    Benelux.add_timer Stella::Engine::Stress, :generate_report
-    Benelux.add_timer Stella::Engine::Stress, :wait_for_reporter
-    
-  end
-end
-