benelux 0.5.0 → 0.5.1

data/CHANGES.txt

@@ -1,5 +1,15 @@
 BENELUX, CHANGES
 
+#### 0.5.1 (2009-10-29) ###############################
+
+* FIXED: Timeline#clear
+* ADDED: Thread#rotate_timeline
+* ADDED: Stats#clear
+
+
+#### 0.5.0 (2009-10-21) ###############################
+
+* CHANGE: Do not use global timeline, update from dead threads. 
 
 #### 0.4.4 (2009-10-20) ###############################
 

data/benelux.gemspec

@@ -1,7 +1,7 @@
 @spec = Gem::Specification.new do |s|
   s.name = "benelux"
   s.rubyforge_project = 'benelux'
-  s.version = "0.5.0"
+  s.version = "0.5.1"
   s.summary = "Benelux: Little freakin' timers for your Ruby codes"
   s.description = s.summary
   s.author = "Delano Mandelbaum"
@@ -24,7 +24,6 @@
   Rakefile
   benelux.gemspec
   lib/benelux.rb
-  lib/benelux/count.rb
   lib/benelux/mark.rb
   lib/benelux/mixins/symbol.rb
   lib/benelux/mixins/thread.rb
@@ -40,7 +39,6 @@
   lib/selectable/tags.rb
   tryouts/10_stats_tryouts.rb
   tryouts/11_selectable_tryouts.rb
-  tryouts/12_selectable_global_tryouts.rb
   tryouts/20_tracks_tryouts.rb
   tryouts/30_reporter_tryouts.rb
   tryouts/30_timeline_tryouts.rb

data/lib/benelux.rb

@@ -5,7 +5,7 @@ require 'thwait'
 require 'selectable'
 
 module Benelux
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
   NOTSUPPORTED = [Class, Object, Kernel]
   
   class BeneluxError < RuntimeError; end
@@ -15,7 +15,6 @@ module Benelux
   class BadRecursion < BeneluxError; end
   
   require 'benelux/mark'
-  require 'benelux/count'
   require 'benelux/track'
   require 'benelux/range'
   require 'benelux/stats'
@@ -65,8 +64,9 @@ module Benelux
       name = Thread.current.track_name
     else
       Thread.current.track_name = name
-      Thread.current.timeline ||= Benelux::Timeline.new
       @@mutex.synchronize do
+        Thread.current.timeline ||= Benelux::Timeline.new
+        Thread.current.rotated_timelines ||= []
         @tracks[name] ||= Track.new(name, group)
         @tracks[name].add_thread Thread.current
         @known_threads << Thread.current
@@ -78,12 +78,26 @@ module Benelux
   
   # Only updates data from threads that are dead
   def Benelux.update_global_timeline
-    dthreads = Benelux.known_threads.select { |t| 
-      !t.timeline.nil? && (t.nil? || !t.status)
-    }
-    # We don't need to make a special case for the 
-    # current thread b/c the current is not dead. 
-    Benelux.timeline.merge! *dthreads.collect { |t| t.timeline }
+    @@mutex.synchronize do
+      dthreads = Benelux.known_threads.select { |t| 
+        !t.timeline.nil? && (t.nil? || !t.status)
+      }
+      # Threads that have rotated timelines
+      rthreads = Benelux.known_threads.select { |t|
+        !t.rotated_timelines.empty?
+      }
+      dtimelines = dthreads.collect { |t| t.timeline }
+      # Also get all rotated timelines. 
+      rthreads.each { |t| 
+        # We loop carefully through the rotated timelines
+        # incase something was added while we're working. 
+        while !t.rotated_timelines.empty?
+          dtimelines.push t.rotated_timelines.shift 
+        end
+      }
+      tl = Benelux.timeline.merge! *dtimelines
+      tl
+    end
   end
   
   # Thread tags become the default for any new Mark or Range. 
@@ -149,6 +163,50 @@ end
 
 
 __END__
+0.5.0:
+ruby -rprofile bin/stella generate -p examples/essentials/plan.rb -c 200 -d 2m localhost:3114
+Summary: 
+  max clients: 200
+  repetitions: 9
+    test time:     117.97s
+    post time:     156.50s
+
+  %   cumulative   self              self     total
+ time   seconds   seconds    calls  ms/call  ms/call  name
+ 32.38    71.88     71.88      200   359.40   359.40  Thread#join
+  9.63    93.25     21.37   166149     0.13     0.20  Selectable::Tags#==
+  8.79   112.77     19.52   166149     0.12     0.69  Selectable::Tags#>=
+  8.42   131.47     18.70   170598     0.11     0.31  Kernel.send
+  4.38   141.19      9.72   166149     0.06     0.39  Selectable::Tags#<=>
+  4.31   150.75      9.56    50641     0.19     0.25  Benelux::Stats::Calculator#merge!
+  3.74   159.06      8.31   296362     0.03     0.03  Hash#values
+  3.03   165.78      6.72   556828     0.01     0.01  Array#size
+  2.61   171.57      5.79   166150     0.03     0.05  Array#&
+  2.25   176.57      5.00    36169     0.14     0.28  Selectable::Tags#compare_Array
+  1.56   180.04      3.47   332505     0.01     0.01  Fixnum#>=
+  1.53   183.44      3.40     4224     0.80    26.52  Array#each
+  1.32   186.37      2.93   166476     0.02     0.02  Kernel.is_a?
+  0.96   188.50      2.13   172011     0.01     0.01  Kernel.class
+  0.84   190.36      1.86    50641     0.04     0.05  Selectable::Object.add_tags_quick
+  0.83   192.21      1.85    14466     0.13     0.17  Selectable::Tags#compare_Hash
+  0.80   193.98      1.77   170551     0.01     0.01  Module#to_s
+  0.79   195.73      1.75   152534     0.01     0.01  Float#+
+  0.71   197.31      1.58   166192     0.01     0.01  String#intern
+  0.64   198.74      1.43    54292     0.03     0.03  Numeric#eql?
+  0.63   200.14      1.40    83392     0.02     0.02  String#eql?
+  0.53   201.31      1.17   130778     0.01     0.01  Fixnum#==
+  0.35   202.09      0.78     7310     0.11     0.15  Enumerable.member?
+  0.32   202.81      0.72    35940     0.02     0.02  Hash#==
+  0.30   203.48      0.67      201     3.33     6.37  Thread#new
+  0.29   204.12      0.64       11    58.18    70.00  Array#collect
+  0.27   204.73      0.61    35940     0.02     0.02  Hash#size
+  0.27   205.34      0.61      201     3.03     3.03  Thread#initialize
+  0.21   205.80      0.46    13901     0.03     0.03  Fixnum#>
+  0.21   206.26      0.46      202     2.28     7.08  Kernel.require
+  0.20   206.70      0.44    50681     0.01     0.01  Hash#merge!
+  0.16   207.05      0.35     2666     0.13     0.13  Array#push
+  
+0.4.2 and Earlier:
  %   cumulative   self              self     total
 time   seconds   seconds    calls  ms/call  ms/call  name
 33.04    40.39     40.39   832483     0.05     0.10  Selectable::Tags#==

data/lib/benelux/mixins/thread.rb

@@ -4,4 +4,11 @@ class Thread
   extend Attic
   attic :timeline
   attic :track_name
+  attic :rotated_timelines
+  def rotate_timeline
+    prev = self.timeline
+    self.timeline = Benelux::Timeline.new
+    self.rotated_timelines << prev
+    self.timeline
+  end
 end

data/lib/benelux/stats.rb

@@ -15,6 +15,10 @@ module Benelux
       g.name = name
       g
     end
+    def clear
+      each { |g| g.clear }
+      @names.clear
+    end
     def size
       @names.size
     end

data/lib/benelux/timeline.rb

@@ -19,7 +19,6 @@ module Benelux
   #
   class Timeline < Array
     include Selectable
-    
     attr_accessor :ranges
     attr_accessor :stats
     attr_accessor :default_tags
@@ -44,6 +43,10 @@ module Benelux
       @default_tags[:track]
     end
     
+    def dump
+       
+    end
+    
     def duration
       self.last - self.first
     end
@@ -120,6 +123,7 @@ module Benelux
     
     def clear
       @ranges.clear
+      @stats.clear
       super
     end
     

data/tryouts/20_tracks_tryouts.rb

@@ -20,87 +20,3 @@ tryouts "Tracks" do
   end
   
 end
-
-__END__
-# OLD (0.3): 
-
-tryouts "Essentials" do
-  
-  setup do
-    class ::Sleeper
-      def   do_something()  sleep rand/3 end
-      def another_method(t) t*2          end 
-    end
-  end
-
-  drill "Add timers to existing objects", true do
-    Benelux.add_timer Sleeper, :do_something
-    Sleeper.new.respond_to? :timeline
-  end
-  
-  dream :class, SelectableArray
-  dream :size, 1
-  dream :proc, lambda { |obj|
-    pm = obj.first
-    pm.class == Benelux::MethodTimer && 
-    pm.meth == :do_something &&
-    pm.klass == Sleeper
-  }
-  drill "Keeps a list of modified methods" do
-    Benelux.packed_methods
-  end
-  
-  drill "Knows what a timer has been defined", true do
-    Benelux.timed_method? :Sleeper, :do_something
-  end
-  
-  drill "Knows what a timer has not been defined", false do
-    Benelux.timed_method? :Sleeper, :no_such_method
-  end
-  
-  dream :class, SelectableArray
-  drill "A Benelux object has a timed_methods method" do
-    s = Sleeper.new
-    s.do_something
-    s.timed_methods
-  end
-
-end
-
-tryouts "Counters" do
-  setup do
-    class ::Sleeper
-      def   do_something()  sleep rand/3 end
-      def another_method(t) t*2          end 
-    end
-  end
-  drill "Add timers to existing objects", true do
-    Benelux.add_counter Sleeper, :another_method do |args,ret|
-      ret
-    end
-    Sleeper.new.respond_to? :timeline
-  end
-  dream :kind_of?, Benelux::MethodPacker
-  drill "Can get specific packed method" do
-    Benelux.packed_method Sleeper, :another_method
-  end
-  
-  dream :class, Benelux::Count
-  dream :name, :another_method
-  dream :to_i, 2000
-  drill "Run counter" do
-    a = Sleeper.new
-    a.another_method(1000)
-    pm = Benelux.packed_method Sleeper, :another_method
-    Benelux.thread_timeline.counts.first
-  end
-end
-
-xtryouts "Not supported" do
-  
-  dream :exception, Benelux::NotSupported
-  drill "Class is not supported" do
-    Benelux.add_timer Class, :new
-  end
-  
-end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: benelux
 version: !ruby/object:Gem::Version 
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors: 
 - Delano Mandelbaum
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-21 00:00:00 -04:00
+date: 2009-10-29 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -39,7 +39,6 @@ files:
 - Rakefile
 - benelux.gemspec
 - lib/benelux.rb
-- lib/benelux/count.rb
 - lib/benelux/mark.rb
 - lib/benelux/mixins/symbol.rb
 - lib/benelux/mixins/thread.rb
@@ -55,7 +54,6 @@ files:
 - lib/selectable/tags.rb
 - tryouts/10_stats_tryouts.rb
 - tryouts/11_selectable_tryouts.rb
-- tryouts/12_selectable_global_tryouts.rb
 - tryouts/20_tracks_tryouts.rb
 - tryouts/30_reporter_tryouts.rb
 - tryouts/30_timeline_tryouts.rb
@@ -91,7 +89,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: benelux
-rubygems_version: 1.3.2
+rubygems_version: 1.3.3
 signing_key: 
 specification_version: 3
 summary: "Benelux: Little freakin' timers for your Ruby codes"

data/lib/benelux/count.rb

@@ -1,29 +0,0 @@
-module Benelux
-  
-  class Count
-    include Selectable::Object
-    attr_accessor :name
-    def initialize(name, count)
-      @name, @count = name, count
-    end
-    def track 
-      @tags[:track]
-    end
-    def inspect
-      "#<%s:%s count=%d name=%s %s>" % [self.class, hexoid, self.to_i, name, tags]
-    end
-    def to_i
-      @count.to_i
-    end
-    def to_s
-      @count.to_s
-    end
-    def ==(other)
-      self.class == other.class &&
-      self.name == other.name &&
-      self.tags == other.tags &&
-      @count.to_i == other.to_i
-    end
-
-  end
-end

data/tryouts/12_selectable_global_tryouts.rb

@@ -1,23 +0,0 @@
-# 
-# group "Benelux"
-# 
-# library :benelux, 'lib'
-# tryouts "Selectable::Global" do
-#   set :bast, Benelux::Counts.new
-#   setup do
-#     
-#   end
-# 
-#   dream :class, Benelux::Counts
-#   dream :names, [:group1, :group2]
-#   drill "Add groups" do
-#     bast.add_group :group1, :group2
-#     bast
-#   end
-#     
-#   drill "Add objects to groups", true do
-#     bast.send(:group1).class
-#     bast.class.group_class
-#   end
-#   
-# end