stud 0.0.8 → 0.0.10

data/lib/stud/benchmark.rb

@@ -3,26 +3,55 @@
 #   * Compare performance of different implementations.
 #     * run each implementation N times, compare runtimes (histogram, etc)
 
+require "metriks"
+require "stud/benchmark/rusage"
+
 module Stud
   module Benchmark
     def self.run(iterations=1, &block)
-      i = 0
-      data = []
-      full_start = Time.now
-      while i < iterations
-        start = Time.now
-        block.call
-        duration = Time.now - start
-        data << duration
-        i += 1
-      end
-      return Results.new(data)
+      timer = Metriks::Timer.new
+      iterations.times { timer.time(&block) }
+      return Results.new(timer)
     end # def run
 
+    def self.runtimed(seconds=10, &block)
+      timer = Metriks::Timer.new
+      expiration = Time.now + seconds
+      timer.time(&block) while Time.now < expiration
+      return Results.new(timer)
+    end # def runtimed
+
+    def self.cputimed(seconds=10, &block)
+      timer = Metriks::Timer.new
+      expiration = Time.now + seconds
+      while Time.now < expiration
+        start = Stud::Benchmark::RUsage.get
+        block.call
+        finish = Stud::Benchmark::RUsage.get
+        cputime = (finish.user + finish.system) - (start.user + start.system)
+        timer.update(cputime)
+      end # while not expired
+      return Results.new(timer)
+    end # self.cpu
+
     class Results
       include Enumerable
       # Stolen from https://github.com/holman/spark/blob/master/spark
-      TICKS = %w{▁ ▂ ▃ ▄ ▅ ▆ ▇ █}
+      # TICKS = %w{▁ ▂ ▃ ▄ ▅ ▆ ▇ █}
+
+      TICKS = ["\x1b[38;5;#{232 + 8}m_\x1b[0m"] + %w{▁ ▂ ▃ ▄ ▅ ▆ ▇ █}
+
+      #.collect do |tick|
+        # 256 color support, use grayscale
+        #1.times.collect do |shade|
+          # '38' is foreground
+          # '48' is background
+          # Grey colors start at 232, but let's use the brighter half.
+          # escape [ 38 ; 5 ; <color>
+          #"\x1b[38;5;#{232 + 12 + 2 * shade}m#{tick}\x1b[0m"
+        #end
+        #tick
+      #end.flatten
 
       def initialize(data)
         @data = data
@@ -39,86 +68,51 @@ module Stud
       end # def environment
 
       def each(&block)
-        @data.each(&block)
+        @data.snapshot.each(&block)
       end # def each
 
-      def log_distribution
-        return distribution do |value|
-          if value == 0
-            0 ... 0
-          else
-            tick = (Math.log2(value).floor).to_f rescue 0
-            (2 ** tick) ... (2 ** (tick+1))
-          end
-        end
-      end # def log_distribution
-
-      def distribution(&range_compute)
-        raise ArgumentError.new("Missing range computation block") if !block_given?
+      def min
+        return @data.min
+      end
 
-        max = @data.max
-        dist = Hash.new { |h,k| h[k] = 0 }
-        each do |value| 
-          range = range_compute.call(value)
-          dist[range] += 1
-        end
-        return dist
-      end # def distribution
+      def max
+        return @data.max
+      end
 
       def mean
-        if @mean.nil?
-          total = Float(@data.count)
-          @mean = sum / total
-        end
-        return @mean
+        return @data.mean
       end # def mean
 
       def stddev
-        # sum of square deviations of mean divided by total values
-        return Math.sqrt(inject(0) { |s, v| s + (v - mean) ** 2 } / (@data.count - 1))
+        # work around (Timer#stddev reports the variance)
+        # https://github.com/eric/metriks/pull/29
+        return @data.stddev ** 0.5
       end # def stddev
 
       def sum
-        if @sum.nil?
-          @sum = inject(0) { |s,v| s + v }
-        end
-        return @sum
+        return @data.instance_eval { @histogram.sum }
       end # def sum
 
-      def to_s
-        return "#{environment}: avg: #{mean} stddev: #{stddev}"
-      end # def to_s
-
       def pretty_print
-        min = @data.min
-        max = @data.max
-        zmax = Float(max - min) # "zero" at the 'min' value, offset the max.
-        incr = 0.1 # 10% increments
-        #dist = distribution do |value|
-          #percent = (value - min) / zmax
-          #if percent == 1
-            #(1 - incr ... 1.0)
-          #else
-            #start = ((percent * 10).floor / 10.0)
-            #start ... (start + incr)
-          #end
-        #end
-        dist = log_distribution
+        puts self
+      end # def pretty_print
 
-        total = dist.inject(0) { |sum, (step, count)| sum + count }
-        sorted = dist.sort { |a,b| a.first.begin <=> b.first.begin }
-        puts sorted.collect { |lower_bound, count|
-          #puts lower_bound
-          percent = (count / Float(total))
-          "%40s: %s" % [lower_bound, (TICKS.last * (50 * percent).ceil)]
-        }.join("\n")
+      def to_s(scale=min .. max, ticks=10)
+        snapshot = @data.snapshot
+        values = snapshot.instance_eval { @values }
+        scale_distance = scale.end - scale.begin
+        tick = scale_distance / ticks
+        dist = ticks.to_i.times.collect do |i|
+          range = (scale.begin + tick * i) ... (scale.begin + tick * (i+1))
+          hits = values.select { |v| range.include?(v) }.count
+          percent = hits / values.size.to_f
+          next TICKS[(TICKS.count * percent).ceil] || TICKS.last
+        end
 
-      end # def pretty_print
+        return sprintf("%20s %s (%.4f ... %.4f, mean: %0.4f, stddev: %0.4f)",
+                       environment, dist.join(""), scale.begin, scale.end,
+                       mean, stddev)
+      end # def to_s
     end # class Stud::Benchmark::Result
   end # module Benchmark
 end # module Stud
-
-#require "thread"
-#mutex = Mutex.new
-#results = Stud::Benchmark.run(20) { mutex.synchronize { rand; rand; rand } }
-#results.pretty_print

data/lib/stud/benchmark/rusage.rb

@@ -0,0 +1,54 @@
+require "ffi"
+
+module Stud
+  module Benchmark
+    module LibC
+      extend FFI::Library
+      ffi_lib "libc.so.6"
+
+      attach_function :getrusage, [:int, :pointer], :int
+    end
+
+    class TimeVal < FFI::Struct
+      layout :tv_sec, :long,
+             :tv_usec, :int32
+
+      def to_f
+        return self[:tv_sec] + (self[:tv_usec] / 1_000_000.0)
+      end
+    end
+
+    class RUsage < FFI::Struct
+      layout :utime, TimeVal,
+             :stime, TimeVal,
+             :maxrss, :long,
+             :ixrss, :long,
+             :idrss, :long,
+             :isrss, :long,
+             :minflt, :long,
+             :majflt, :long,
+             :nswap, :long,
+             :inblock, :long,
+             :oublock, :long,
+             :msgsnd, :long,
+             :msgrcv, :long,
+             :nsignals, :long,
+             :nvcsw, :long,
+             :nivcsw, :long
+
+      def self.get
+        usage = RUsage.new
+        LibC.getrusage(0, usage)
+        return usage
+      end
+
+      def user
+        return self[:utime].to_f
+      end
+
+      def system
+        return self[:stime].to_f
+      end
+    end # class RUsage
+  end # module Benchmark
+end # module Stud

data/lib/stud/interval.rb

@@ -5,7 +5,7 @@ module Stud
   #
   # The execution patterns of this method should be that 
   # the start time of 'block.call' should always be at time T*interval
-  def interval(time, &block)
+  def self.interval(time, &block)
     start = Time.now
     while true
       block.call
@@ -20,4 +20,8 @@ module Stud
       end
     end # loop forever
   end # def interval
+  
+  def interval(time, &block)
+    return Stud.interval(time, &block)
+  end # def interval
 end # module Stud

data/lib/stud/trap.rb

@@ -19,7 +19,7 @@ module Stud
   end
 
   def self.simulate_signal(signal)
-    puts "Simulate: #{signal}"
+    puts "Simulate: #{signal} w/ #{@traps[signal].count} callbacks"
     @traps[signal].each(&:call)
   end
 end

metadata

@@ -1,89 +1,130 @@
 --- !ruby/object:Gem::Specification
 name: stud
 version: !ruby/object:Gem::Version
-  version: 0.0.8
-  prerelease: 
+  version: 0.0.10
+  prerelease:
 platform: ruby
 authors:
 - Jordan Sissel
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-11-06 00:00:00.000000000 Z
+date: 2013-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  name: metriks
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: !binary |-
+          MA==
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: !binary |-
+          MA==
+    none: false
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: ffi
   version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: !binary |-
+          MA==
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: !binary |-
+          MA==
+    none: false
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
-  name: insist
-  requirement: !ruby/object:Gem::Requirement
+  name: rspec
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: !binary |-
+          MA==
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: !binary |-
+          MA==
+    none: false
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: insist
   version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: !binary |-
+          MA==
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-description: small reusable bits of code I'm tired of writing over and over. A library
-  form of my software-patterns github repo.
+        version: !binary |-
+          MA==
+    none: false
+  prerelease: false
+  type: :development
+description: small reusable bits of code I'm tired of writing over and over. A library form of my software-patterns github repo.
 email: jls@semicomplete.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/stud/task.rb
+- lib/stud/benchmark.rb
+- lib/stud/pool.rb
 - lib/stud/try.rb
 - lib/stud/interval.rb
-- lib/stud/benchmark.rb
-- lib/stud/task.rb
 - lib/stud/trap.rb
 - lib/stud/secret.rb
-- lib/stud/pool.rb
+- lib/stud/benchmark/rusage.rb
 - LICENSE
 - CHANGELIST
 - README.md
 homepage: https://github.com/jordansissel/ruby-stud
 licenses: []
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: !binary |-
+        MA==
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: !binary |-
+        MA==
+  none: false
 requirements: []
-rubyforge_project: 
+rubyforge_project:
 rubygems_version: 1.8.24
-signing_key: 
+signing_key:
 specification_version: 3
 summary: stud - common code techniques
 test_files: []
-has_rdoc: