benelux 0.5.7 → 0.5.8

data/CHANGES.txt

@@ -1,5 +1,12 @@
 BENELUX, CHANGES
 
+
+#### 0.5.8 (2010-03-05) ###############################
+
+* CHANGE: Added sum and sumsq to Benelux::Stats::Calculator#to_hash
+* ADDED: Support for timer and counter aliases
+
+
 #### 0.5.7 (2010-02-20) ###############################
 
 * CHANGE: Remove hanna dependency
@@ -13,6 +20,7 @@ BENELUX, CHANGES
 * ADDED: Benelux.timeline_chunk, Benelux.timeline_updates
 * ADDED: Calculator#to_json
 
+
 #### 0.5.5 (2010-01-16) ###############################
 
 * ADDED: Benelux.bm 

data/benelux.gemspec

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

data/lib/benelux.rb

@@ -4,7 +4,7 @@ require 'thwait'
 require 'selectable'
 
 module Benelux
-  VERSION = "0.5.7"
+  VERSION = "0.5.8"
   NOTSUPPORTED = [Class, Object, Kernel]
   
   class BeneluxError < RuntimeError; end
@@ -147,15 +147,15 @@ module Benelux
     !Benelux.packed_method(klass, meth).nil?
   end
   
-  def Benelux.add_timer klass, meth, &blk
+  def Benelux.add_timer klass, meth, aliaz=nil, &blk
     raise NotSupported, klass unless Benelux.supported? klass
     raise AlreadyTimed, klass if Benelux.packed_method? klass, meth
-    Benelux::MethodTimer.new klass, meth, &blk
+    Benelux::MethodTimer.new klass, meth, aliaz, &blk
   end
   
-  def Benelux.add_counter klass, meth, &blk
+  def Benelux.add_counter klass, meth, aliaz=nil, &blk
     raise NotSupported, klass unless Benelux.supported? klass
-    Benelux::MethodCounter.new klass, meth, &blk
+    Benelux::MethodCounter.new klass, meth, aliaz, &blk
   end
   
   def Benelux.ld(*msg)

data/lib/benelux/packer.rb

@@ -4,6 +4,7 @@ module Benelux
   class MethodPacker
     include Selectable::Object
     
+    attr_accessor :methorig
     attr_accessor :aliaz
     attr_reader   :klass
     attr_reader   :meth
@@ -11,7 +12,8 @@ module Benelux
     
     # * +k+ is a class
     # * +m+ is the name of an instance method in +k+
-    # 
+    # * +aliaz+ is an optional name for 
+    #
     # This method makes the following changes to class +k+. 
     #
     # * Add a timeline attic to and include +Benelux+ 
@@ -19,12 +21,13 @@ module Benelux
     #   __benelux_execute_2151884308_2165479316
     # * Install a new method with the name +m+.
     #
-    def initialize(k,m,&blk)
+    def initialize(k,m,aliaz,&blk)
       Benelux.ld "%20s: %s#%s" % [self.class, k, m]
       if Benelux.packed_method? k, m
         raise SelectableError, "Already defined (#{k} #{m})"
       end
-      @klass, @meth, @blk = k, m, blk
+      @klass, @meth, @aliaz, @blk = k, m, aliaz, blk
+      @aliaz ||= meth
       @klass.extend Attic  unless @klass.kind_of?(Attic)
       unless @klass.kind_of?(Benelux)
         @klass.attic :timeline
@@ -36,10 +39,10 @@ module Benelux
       ##  raise NoMethodError, "undefined method `#{meth}' for #{obj}:Class"
       ##end
       thread_id, call_id = Thread.current.object_id.abs, @klass.object_id.abs
-      @aliaz = a = :"__benelux_#{@meth}_#{thread_id}_#{call_id}"
-      Benelux.ld "%20s: %s" % ['Alias', @aliaz] 
+      @methorig = methorig = :"__benelux_#{@meth}_#{thread_id}_#{call_id}"
+      Benelux.ld "%20s: %s" % ['Alias', @methorig] 
       @klass.module_eval do
-        alias_method a, m  # Can't use the instance variables
+        alias_method methorig, m  # Can't use the instance variables
       end
       install_method  # see generate_packed_method
       self.add_tags :class => @klass.to_s.to_sym, 
@@ -85,7 +88,7 @@ module Benelux
     end
     
     # Creates a method definition (for an eval). The 
-    # method is named +@meth+ and it calls +@aliaz+.
+    # method is named +@meth+ and it calls +@methorig+.
     #
     # The new method adds a Mark to the thread timeline
     # before and after +@alias+ is called. It also adds
@@ -95,16 +98,16 @@ module Benelux
       def #{@meth}(*args, &block)
         call_id = "" << self.object_id.abs.to_s << args.object_id.abs.to_s
         Benelux.current_track :global unless Benelux.known_thread?
-        mark_a = Benelux.thread_timeline.add_mark :'#{@meth}_a'
+        mark_a = Benelux.thread_timeline.add_mark :'#{@aliaz}_a'
         mark_a.add_tag :call_id => call_id
         tags = mark_a.tags
-        ret = #{@aliaz}(*args, &block)
+        ret = #{@methorig}(*args, &block)
       rescue => ex  # We do this so we can use
         raise ex    # ex in the ensure block.
       ensure
-        mark_z = Benelux.thread_timeline.add_mark :'#{@meth}_z'
+        mark_z = Benelux.thread_timeline.add_mark :'#{@aliaz}_z'
         mark_z.tags = tags # In case tags were added between these marks
-        range = Benelux.thread_timeline.add_range :'#{@meth}', mark_a, mark_z
+        range = Benelux.thread_timeline.add_range :'#{@aliaz}', mark_a, mark_z
         range.exception = ex if defined?(ex) && !ex.nil?
       end
       }
@@ -123,7 +126,7 @@ module Benelux
         Benelux.current_track :global unless Benelux.known_thread?
         # Get a reference to this MethodCounter instance
         cmd = Benelux.packed_method #{@klass}, :#{@meth}
-        ret = #{@aliaz}(*args, &block)
+        ret = #{@methorig}(*args, &block)
         count = cmd.determine_count(args, ret)
         #Benelux.ld "COUNT(:#{@meth}): \#{count}"
         Benelux.thread_timeline.add_count :'#{@meth}', count

data/lib/benelux/stats.rb

@@ -157,7 +157,6 @@ module Benelux
         @sum += other.sum
         @sumsq += other.sumsq
         @n += other.n
-
         self
       end
       
@@ -210,14 +209,14 @@ module Benelux
         return 0.0 if @n <= 1
         # (sqrt( ((s).sumsq - ( (s).sum * (s).sum / (s).n)) / ((s).n-1) ))
         begin
-          return Math.sqrt( (@sumsq - ( @sum * @sum / @n)) / (@n-1) )
+          return Math.sqrt( (@sumsq - (@sum * @sum / @n)) / (@n-1) )
         rescue Errno::EDOM
           return 0.0
         end
       end
       
       def to_hash
-        { :min => min, :mean => mean, :max => max, :sd => sd, :n => n }
+        { :min => min, :mean => mean, :max => max, :sd => sd, :n => n, :sum => @sum, :sumsq => @sumsq }
       end
       
       def to_json

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: benelux
 version: !ruby/object:Gem::Version 
-  version: 0.5.7
+  version: 0.5.8
 platform: ruby
 authors: 
 - Delano Mandelbaum
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-20 00:00:00 -05:00
+date: 2010-03-05 00:00:00 -05:00
 default_executable: 
 dependencies: []