celluloid-benchmark 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
 SHA1: 
-  metadata.gz: 489556fa1dd07270a9e5d256b6b29d652c83576d
-  data.tar.gz: b302af61be3b35a226a99e122770d3ea5a0a3e5c
+  metadata.gz: c5053fec389c66821a970308a2a660788e0d2c63
+  data.tar.gz: 5bbcac6fff25c7465a179413b5a3a5f3db15ca98
 SHA512: 
-  metadata.gz: c3fff2ef1156ae00624f2f88b103e36404731c70550873200c9e33f480fb095fd42e70c89d68b84a454431815233649c0ce9063c4b7249dc3c1559b2d6bd0388
-  data.tar.gz: f0cc0a4c8d1f09895020e8c15f3cd7b909e81aa9ffa330c9fe7372b6aca692a71cf90060b5769048c82386e12f52cb04947af7c3c6f5212602a3928e860307cf
+  metadata.gz: 1790062aba09ef03ec6e6f42dd95b9dc94b0eb38172869487aa9394d352c02c3d1881172aac099f70050d086194bd45d75276d1602143cc6caac0488362e2184
+  data.tar.gz: ff926c409d718b55a1f2edca1429fe3c59051b0cf4ffa48cca2c11963cbcffb060c73d9d47d83a868a8368cc775b6a6141e8a1614a26e3c4a48368042476150f

data/bin/celluloid-benchmark

@@ -1,7 +1,6 @@
 #! /usr/bin/env ruby
 
 require_relative "../lib/celluloid_benchmark"
-require "os"
 
 session_path = File.expand_path(ARGV[0])
 
@@ -10,11 +9,11 @@ if duration == 0
   duration = 20
 end
 
-benchmark_run = CelluloidBenchmark::Runner.run session_path, duration, (ARGV[2] || OS.cpu_count * 1.5).to_i
+benchmark_run = CelluloidBenchmark::Runner.run session_path, duration, ARGV[2] && ARGV[2].to_i
 
 p benchmark_run
 puts
-p "#{benchmark_run.requests / benchmark_run.elapsed_time} requests per second. #{benchmark_run.requests} requests in #{benchmark_run.elapsed_time} seconds by #{CelluloidBenchmark::Visitor.pool.size} visitors."
+p "#{benchmark_run.requests / benchmark_run.elapsed_time} requests per second. #{benchmark_run.requests} requests in #{benchmark_run.elapsed_time} seconds by #{benchmark_run.visitors} visitors."
 
 puts
 benchmark_run.benchmarks.each do |trans|

data/lib/celluloid_benchmark/benchmark_run.rb

@@ -11,13 +11,14 @@ module CelluloidBenchmark
     attr_accessor :ended_at
     attr_accessor :logger
     attr_accessor :started_at
+    attr_accessor :visitors
     attr_reader :thresholds
 
     def initialize
       if !Dir.exists?("log")
         FileUtils.mkdir "log"
       end
-      
+
       # Could replace with Celluloid.logger
       @logger = ::Logger.new("log/benchmark.log")
       @thresholds = Hash.new
@@ -27,11 +28,11 @@ module CelluloidBenchmark
       time = end_time - start_time
       response_times[label] << time
       response_codes[label] << http_status_code.to_i
-      
+
       if threshold
         thresholds[label] = threshold
       end
-      
+
       logger.info "#{http_status_code} #{time} #{label}"
     end
 
@@ -42,25 +43,25 @@ module CelluloidBenchmark
     def response_codes
       @response_codes ||= Hash.new { |hash, value| hash[value] = [] }
     end
-  
+
     def requests
       response_times.values.compact.map(&:size).reduce(0, &:+)
     end
-    
+
     def benchmarks
       response_times.map do |label, response_times|
         CelluloidBenchmark::Benchmark.new label, thresholds[label], response_times, response_codes[label]
       end
     end
-    
+
     def mark_start
       @started_at = Time.now
     end
-    
+
     def mark_end
       @ended_at = Time.now
     end
-    
+
     def elapsed_time
       if started_at && ended_at
         (ended_at - started_at).to_f
@@ -68,7 +69,7 @@ module CelluloidBenchmark
         0
       end
     end
-  
+
     def ok?
       benchmarks.all?(&:ok?)
     end

data/lib/celluloid_benchmark/runner.rb

@@ -7,37 +7,49 @@ Celluloid.logger = nil
 module CelluloidBenchmark
   # Run a scenario in several Visitors and return a BenchmarkRun
   class Runner
-    def self.run(session_path, duration = 10, visitors = nil)
+    def self.run(session_path, duration = 20, visitors = nil)
       raise("session_path is required") unless session_path
       raise("'#{session_path}' does not exist") unless File.exists?(session_path)
 
       require session_path
 
       VisitorGroup.run!
-      set_visitors_pool_size visitors
+      set_visitor_pool_size visitors
+      visitors = visitors_count(visitors)
+
       benchmark_run = Celluloid::Actor[:benchmark_run]
+      benchmark_run.visitors = visitors
 
       benchmark_run.mark_start
-      futures = run_sessions(benchmark_run, duration)
+      futures = run_sessions(benchmark_run, duration, visitors)
       futures.map(&:value)
       benchmark_run.mark_end
 
       benchmark_run
     end
 
-    def self.run_sessions(benchmark_run, duration)
-      visitors = Celluloid::Actor[:visitor_pool]
+    def self.run_sessions(benchmark_run, duration, visitors)
+      pool = Celluloid::Actor[:visitor_pool]
       futures = []
-      (visitors.size - 2).times do
-        futures << visitors.future.run_session(benchmark_run, duration)
+      visitors.times do
+        futures << pool.future.run_session(benchmark_run, duration)
       end
       futures
     end
 
-    def self.set_visitors_pool_size(size)
+    def self.set_visitor_pool_size(size)
       if size && size.to_i > 0
         Visitor.pool.size = size.to_i + 2
       end
     end
+
+    def self.visitors_count(count)
+      count = count || (Visitor.pool.size - 2)
+      if count > 1
+        count
+      else
+        1
+      end
+    end
   end
 end

data/lib/celluloid_benchmark/version.rb

@@ -1,3 +1,3 @@
 module CelluloidBenchmark
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: celluloid-benchmark
 version: !ruby/object:Gem::Version 
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors: 
 - Scott Willson
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-06-13 00:00:00 Z
+date: 2014-06-19 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: celluloid
@@ -62,14 +62,6 @@ dependencies:
         version: "1.25"
   type: :runtime
   version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: os
-  prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    requirements: 
-    - *id006
-  type: :runtime
-  version_requirements: *id007
 description: |-
   Celluloid Benchmark realistically load tests websites. Write expressive, concise load tests in Ruby. Use Rubinius and Celluloid
   forpec high concurrency. Use Mechanize for a realistic (albeit non-JavaScript) browser client.