benelux 0.5.5 → 0.5.6

data/CHANGES.txt

@@ -1,5 +1,11 @@
 BENELUX, CHANGES
 
+#### 0.5.6 (2010-02-10) ###############################
+
+* ADDED: Benelux::Tms#to_f
+* ADDED: Benelux.timeline_chunk, Benelux.timeline_updates
+* ADDED: Calculator#to_json
+
 #### 0.5.5 (2010-01-16) ###############################
 
 * ADDED: Benelux.bm 

data/README.rdoc

@@ -5,6 +5,7 @@
 
 == Features
 
+* A replacement for Benchmark.measure
 * Create timers for any Ruby method
 * Store arbitrary messages
 * Granular statistics
@@ -14,19 +15,23 @@
 
     require 'benelux'
 
-    # Similar to Benchmark::Tms with the addition of
-    # standard deviation, mean value, and total, for 
-    # each of the times.
+    # Similar to Benchmark.measure but you specify the
+    # number of times to run the block and the number
+    # repetitions. 
     tms = Benelux.bm(1000000, 5) do
       rand
     end
-    
+
+    # Similar to Benchmark::Tms with the addition of
+    # standard deviation, mean value, and total, for 
+    # each of the times.    
     tms.samples              # => 5
     tms.real                 # => 0.45
     tms.real.sd              # => 0.04
     tms.utime                # => 0.44
     tms.utime.sd             # => 0.02
     
+
 == Installation
 
 Get it in one of the following ways:

data/benelux.gemspec

@@ -1,7 +1,7 @@
 @spec = Gem::Specification.new do |s|
   s.name = "benelux"
   s.rubyforge_project = 'benelux'
-  s.version = "0.5.5"
+  s.version = "0.5.6"
   s.summary = "Benelux: A mad way to time Ruby codes"
   s.description = s.summary
   s.author = "Delano Mandelbaum"

data/lib/benelux.rb

@@ -5,7 +5,7 @@ require 'thwait'
 require 'selectable'
 
 module Benelux
-  VERSION = "0.5.5"
+  VERSION = "0.5.6"
   NOTSUPPORTED = [Class, Object, Kernel]
   
   class BeneluxError < RuntimeError; end
@@ -27,12 +27,16 @@ module Benelux
     attr_reader :packed_methods
     attr_reader :tracks
     attr_reader :timeline
+    attr_reader :timeline_chunk
+    attr_reader :timeline_updates
     attr_reader :known_threads
   end
   
   @packed_methods = {}
   @tracks = SelectableHash.new
   @timeline = Timeline.new
+  @timeline_chunk = Timeline.new  # See: update_global_timeline
+  @timeline_updates = 0
   @known_threads = []
   @processed_dead_threads = []
   
@@ -99,8 +103,12 @@ module Benelux
         end
       }
       Benelux.ld [:update_global_timeline, dthreads.size, rthreads.size, dtimelines.size].inspect
-      tl = Benelux.timeline.merge! *dtimelines
+      # Keep track of this update separately
+      @timeline_chunk = Benelux::Timeline.new
+      @timeline_chunk.merge! *dtimelines
       @processed_dead_threads.push *dthreads
+      tl = Benelux.timeline.merge! Benelux.timeline_chunk
+      @timeline_updates += 1
       tl
     end
   end
@@ -173,6 +181,7 @@ module Benelux
   # See Benelux::Stats::Calculator
   #
   class Tms < Struct.new :label, :real, :cstime, :cutime, :stime, :utime, :total
+    # TODO: integrate w/ http://github.com/copiousfreetime/hitimes
     attr_reader :samples
     # +tms+ is a Benchmark::Tms object
     def initialize tms=nil
@@ -191,8 +200,14 @@ module Benelux
         self.send(n).sample tms.send(n) || 0
       }
     end
+    def to_f
+      total.mean.to_f
+    end
+    def to_i
+      total.mean.to_i
+    end
     def to_s
-      total.mean
+      total.mean.to_s
     end
     def inspect
       fields = members.collect { |f| 

data/lib/benelux/stats.rb

@@ -216,6 +216,14 @@ module Benelux
         end
       end
       
+      def to_hash
+        { :min => min, :mean => mean, :max => max, :sd => sd, :n => n }
+      end
+      
+      def to_json
+        to_hash.to_json
+      end
+      
       def ==(other)
         return false unless self.class == other.class
         a=([@sum, @min, @max, @n, @sumsq] - 

data/lib/benelux/timeline.rb

@@ -50,6 +50,7 @@ module Benelux
     end
     
     def duration
+      return 0 if self.last.nil?
       self.last - self.first
     end
     

data/tryouts/30_reporter_tryouts.rb

@@ -1,7 +1,7 @@
 group "Benelux"
 
 library :benelux, 'lib'
-tryouts "Reporter" do
+xtryouts "Reporter" do
   set :reporter, Benelux::Reporter.new
   
   drill "1", true do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: benelux
 version: !ruby/object:Gem::Version 
-  version: 0.5.5
+  version: 0.5.6
 platform: ruby
 authors: 
 - Delano Mandelbaum
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-16 00:00:00 -05:00
+date: 2010-02-10 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency