benchmark_driver 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 0cd5a98489bf28a8f6439e66e91350b20d330433
-  data.tar.gz: bd97724eb0f7bb197bd2453b8eccb17e8fa5dcf2
+SHA256:
+  metadata.gz: c1c86ab9c0e65de1f585af43bea8e331d9f1e4376e7f474ac06ffcb0550e282f
+  data.tar.gz: 1d644ecc22c43af0ae19c7d1c525fe1a12d45d56321803b2ba54e3f37c19311b
 SHA512:
-  metadata.gz: 9debc903a940716911021dafe54dadd4be762259bb8c170c13266b6c15bd56f1762368d4a8982e75d326870b9611be65ba9fe30081a71c91874c489a516aa115
-  data.tar.gz: 72dbf0e5038f7218311364bf5226c4b909a40bb4ab343ccb393a2e76a14c8fe8db4d4f986203fcf6d16a0147afcdd1cf0b8456c19be511b31e49dfbb1b699112
+  metadata.gz: b0e1d5d9f65635161f9694feb3ad685d6006bf8fc83f68ef3133be18bbfe908e08c5f9fbf9546d1775a8be3016b709e4a24eecdc9d4b66cbb879b2d3f7273e94
+  data.tar.gz: 654e5d9a00e5547dfb1e4d110f1147440c829b0af58b995228b237b87bcec309d59cea7cfef94332c430956b2a757bf744c156a167aa3a593b414f733275c7f7

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# v0.9.1
+
+- Fix memory runner bug that actually doesn't run the benchmarked script
+- Add once runner to test benchmark script in a short time
+
 # v0.9.0
 
 - The concept of runner is renewed

data/exe/benchmark-driver

@@ -12,7 +12,7 @@ config = BenchmarkDriver::Config.new.tap do |c|
   bundler = false
   parser = OptionParser.new do |o|
     o.banner = "Usage: #{File.basename($0, '.*')} [options] [YAML]"
-    o.on('-r', '--runner [TYPE]', 'Specify runner type: ips, time, memory (default: ips)') do |d|
+    o.on('-r', '--runner [TYPE]', 'Specify runner type: ips, time, memory, once (default: ips)') do |d|
       abort '-r, --runner must take argument but not given' if d.nil?
       c.runner_type = d
     end

data/lib/benchmark_driver/output/compare.rb

@@ -110,6 +110,8 @@ class BenchmarkDriver::Output::Compare
     end
 
     scale = (Math.log10(value) / 3).to_i
+    return "%#{width}s" % value.to_s if scale < 0 # like 1.23e-04
+
     prefix = "%#{width}.3f" % (value.to_f / (1000 ** scale))
     suffix =
       case scale

data/lib/benchmark_driver/runner.rb

@@ -2,6 +2,7 @@ module BenchmarkDriver
   module Runner
     require 'benchmark_driver/runner/ips'
     require 'benchmark_driver/runner/memory'
+    require 'benchmark_driver/runner/once'
     require 'benchmark_driver/runner/time'
   end
 

data/lib/benchmark_driver/runner/ips.rb

@@ -5,6 +5,7 @@ require 'benchmark_driver/default_job_parser'
 require 'tempfile'
 require 'shellwords'
 
+# Show iteration per second.
 class BenchmarkDriver::Runner::Ips
   # JobParser returns this, `BenchmarkDriver::Runner.runner_for` searches "*::Job"
   Job = Class.new(BenchmarkDriver::DefaultJob)

data/lib/benchmark_driver/runner/memory.rb

@@ -72,10 +72,8 @@ class BenchmarkDriver::Runner::Memory
       loop_count: job.loop_count,
     )
 
-    output = Tempfile.open(['benchmark_driver-', '.rb']) do |f|
-      with_script(benchmark.render(result: f.path)) do |path|
-        execute('/usr/bin/time', *exec.command, path)
-      end
+    output = with_script(benchmark.render) do |path|
+      execute('/usr/bin/time', *exec.command, path)
     end
 
     match_data = /^(?<user>\d+.\d+)user\s+(?<system>\d+.\d+)system\s+(?<elapsed1>\d+):(?<elapsed2>\d+.\d+)elapsed.+\([^\s]+\s+(?<maxresident>\d+)maxresident\)k$/.match(output)
@@ -108,11 +106,10 @@ class BenchmarkDriver::Runner::Memory
   # @param [String] teardown
   # @param [Integer] loop_count
   BenchmarkScript = ::BenchmarkDriver::Struct.new(:prelude, :script, :teardown, :loop_count) do
-    # @param [String] result - A file to write result
-    def render(result:)
+    def render
       <<-RUBY
 #{prelude}
-#{while_loop('', loop_count)}
+#{while_loop(script, loop_count)}
 #{teardown}
       RUBY
     end

data/lib/benchmark_driver/runner/once.rb

@@ -0,0 +1,104 @@
+require 'benchmark_driver/struct'
+require 'benchmark_driver/metrics'
+require 'benchmark_driver/default_job'
+require 'benchmark_driver/default_job_parser'
+require 'tempfile'
+require 'shellwords'
+
+# Run only once, for testing
+class BenchmarkDriver::Runner::Once
+  # JobParser returns this, `BenchmarkDriver::Runner.runner_for` searches "*::Job"
+  Job = Class.new(BenchmarkDriver::DefaultJob)
+  # Dynamically fetched and used by `BenchmarkDriver::JobParser.parse`
+  JobParser = BenchmarkDriver::DefaultJobParser.for(Job)
+  # Passed to `output` by `BenchmarkDriver::Runner.run`
+  MetricsType = BenchmarkDriver::Metrics::Type.new(unit: 'i/s')
+
+  # @param [BenchmarkDriver::Config::RunnerConfig] config
+  # @param [BenchmarkDriver::Output::*] output
+  def initialize(config:, output:)
+    @config = config
+    @output = output
+  end
+
+  # This method is dynamically called by `BenchmarkDriver::JobRunner.run`
+  # @param [Array<BenchmarkDriver::Default::Job>] jobs
+  def run(jobs)
+    jobs = jobs.map do |job|
+      Job.new(job.to_h.merge(loop_count: 1)) # to show this on output
+    end
+
+    @output.with_benchmark do
+      jobs.each do |job|
+        @output.with_job(job) do
+          @config.executables.each do |exec|
+            metrics = run_benchmark(job, exec: exec) # no repeat support
+            @output.report(metrics)
+          end
+        end
+      end
+    end
+  end
+
+  private
+
+  # @param [BenchmarkDriver::Runner::Ips::Job] job - loop_count is not nil
+  # @param [BenchmarkDriver::Config::Executable] exec
+  # @return [BenchmarkDriver::Metrics]
+  def run_benchmark(job, exec:)
+    benchmark = BenchmarkScript.new(
+      prelude:    job.prelude,
+      script:     job.script,
+      teardown:   job.teardown,
+      loop_count: job.loop_count,
+    )
+
+    duration = Tempfile.open(['benchmark_driver-', '.rb']) do |f|
+      with_script(benchmark.render(result: f.path)) do |path|
+        execute(*exec.command, path)
+      end
+      Float(f.read)
+    end
+
+    BenchmarkDriver::Metrics.new(
+      value: 1.0 / duration,
+      duration: duration,
+      executable: exec,
+    )
+  end
+
+  def with_script(script)
+    Tempfile.open(['benchmark_driver-', '.rb']) do |f|
+      f.puts script
+      f.close
+      return yield(f.path)
+    end
+  end
+
+  def execute(*args)
+    output = IO.popen(args, err: [:child, :out], &:read) # handle stdout?
+    unless $?.success?
+      raise "Failed to execute: #{args.shelljoin} (status: #{$?.exitstatus})"
+    end
+    output
+  end
+
+  # @param [String] prelude
+  # @param [String] script
+  # @param [String] teardown
+  # @param [Integer] loop_count
+  BenchmarkScript = ::BenchmarkDriver::Struct.new(:prelude, :script, :teardown, :loop_count) do
+    # @param [String] result - A file to write result
+    def render(result:)
+      <<-RUBY
+#{prelude}
+__bmdv_before = Time.now
+#{script}
+__bmdv_after = Time.now
+File.write(#{result.dump}, (__bmdv_after - __bmdv_before).inspect)
+#{teardown}
+      RUBY
+    end
+  end
+  private_constant :BenchmarkScript
+end

data/lib/benchmark_driver/version.rb

@@ -1,3 +1,3 @@
 module BenchmarkDriver
-  VERSION = '0.9.0'
+  VERSION = '0.9.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: benchmark_driver
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Takashi Kokubun
@@ -83,6 +83,7 @@ files:
 - lib/benchmark_driver/runner.rb
 - lib/benchmark_driver/runner/ips.rb
 - lib/benchmark_driver/runner/memory.rb
+- lib/benchmark_driver/runner/once.rb
 - lib/benchmark_driver/runner/time.rb
 - lib/benchmark_driver/struct.rb
 - lib/benchmark_driver/version.rb
@@ -106,7 +107,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Fully-featured accurate benchmark driver for Ruby