@@ -10,11 +10,10 @@ as any time spent in any instrumented methods invoked by the method. After leaving the top-most method, a call tree with timings is dumped to $stdout. -Note: You aren't allowed to instrument methods on the Benchmark or -String classes, or any object's #inspect method, because it can -generate a recursive loop! For #fine-grained profiling on any -arbitrary class, use profiler or ruby-prof instead. You're also -not allowed to instrument an instrumented method. +Note: You aren't allowed to instrument methods on the String class, or any +object's #inspect method, because it can generate a recursive loop! For +#fine-grained profiling on any arbitrary class, use profiler or ruby-prof +instead. You're also not allowed to instrument an instrumented method. ## Example README.markdown @@ -1,5 +1,3 @@ -require 'benchmark' - module Stickshift class << self; attr_accessor :enabled, :top_level_trigger, :output; end @enabled = true @@ -35,7 +33,7 @@ module Stickshift begin Timer.current = self result = nil - @elapsed = Benchmark.realtime do + @elapsed = realtime do result = block.call end result @@ -45,6 +43,12 @@ module Stickshift end end + def realtime + start = Time.now + yield + Time.now - start + end + def add(child) children << child end @@ -63,16 +67,20 @@ module Stickshift end def ms(t) - (t * 1000).to_i + (t * 1000) end def self_format - @self_format ||= @parent.self_format if @parent - @self_format ||= "%#{total_time.to_s.length}s" + @self_format ||= if @parent + @parent.self_format + else + width = ("%0.2f" % total_time).length + "%#{width}.2f" + end end def self_time - @self_time ||= ms(elapsed - children.inject(0) {|sum,el| sum += el.elapsed}).to_s + @self_time ||= ms(elapsed - children.inject(0) {|sum,el| sum += el.elapsed}) end def total_time @@ -105,7 +113,7 @@ class Module end end - RESTRICTED_CLASSES = [String, (class << Benchmark; self; end), Benchmark] + RESTRICTED_CLASSES = [String] RESTRICTED_METHODS = %w(inspect __send__ __id__) def instrumented?(meth) lib/stickshift.rb @@ -154,9 +154,5 @@ class StickshiftTest < Test::Unit::TestCase def test_cannot_instrument_string_or_benchmark_methods String.instrument :to_s assert !String.instance_methods.include?(instrumented_name(:to_s)) - assert ! class << Benchmark; - instrument :realtime - self.instance_methods.include?(TestHelper::instrumented_name(:realtime)) - end end end test/test_stickshift.rb 5d9fb3d7e0c07f4a112fbe95c32cf5540034564f Nick Sieger nick@nicksieger.com http://github.com/nicksieger/stickshift/commit/f758989271990f182c8cf2d9e900766f188ad748 f758989271990f182c8cf2d9e900766f188ad748 2008-08-13T12:36:13-07:00 2008-08-13T12:36:13-07:00 Get rid of Benchmark.realtime to get sub-millisecond timings, and display milliseconds as a float value. 86d6a1cd56af744469763d5cf24159e74e1dd831 Nick Sieger nick@nicksieger.com