benchmark_driver 0.14.12 → 0.14.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 96515f1044447c4af52568f81df7d53d14996eda949fa5043d0d6df4626992d7
-  data.tar.gz: cf0bd329bf7b4abdb96bc91e8ac18ec3e37ad4b10d2e471b492594afe5d8f813
+  metadata.gz: 22df737d5e378a5ea29b9667ffc96fc767427f27b0bb9e21b548b4fb5caf4463
+  data.tar.gz: fe45db762725218c739bb412a06189221fb6f5cb0e89a27071a1d302ce90c5bd
 SHA512:
-  metadata.gz: c4efb62e805ea16a6903bac564639f17b920721f8b7af3e090d366fdf8bdf1332f36f804f5d8b068cb7859f281a030569a4a7a0e5bdcb494d0871cacc82e6415
-  data.tar.gz: 6d2c8514a1fcb17ab40d5bdee0b29f6d37a241eb825d1799741fe717ea121e734202f2be14c77e8d85d057da08ddf158ade799ff48866e49307a3e9098124e59
+  metadata.gz: 5d903d9b8d9b821f6eefbd21defc201714f6ec2e5436ca9374228756873a7693f37c4974cff38bfb2da01711bf394b8c516c8f6ce974ad19574a484ed780d4a7
+  data.tar.gz: 9b7e96da26336be348c4660328330c467f4f92ded7ad60538c23a6bfeb72fb58eddc8e7b7f1cedcccd30d340f34869191b71466e093c2ff93e2b6517ec658c87

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# v0.14.13
+
+- Add macOS support to memory runner
+  [#53](https://github.com/benchmark-driver/benchmark-driver/pull/53)
+
 # v0.14.12
 
 - Reduce the risk of random ZeroDivisionError on warmup

data/lib/benchmark_driver/runner/memory.rb

@@ -29,7 +29,12 @@ class BenchmarkDriver::Runner::Memory
   # @param [Array<BenchmarkDriver::Default::Job>] jobs
   def run(jobs)
     # Currently Linux's time(1) support only...
-    if Etc.uname.fetch(:sysname) != 'Linux'
+    case Etc.uname.fetch(:sysname)
+    when 'Linux'
+      @time_command = ['/usr/bin/time']
+    when 'Darwin'
+      @time_command = ['/usr/bin/time', '-l']
+    else
       raise "memory output is not supported for '#{Etc.uname[:sysname]}' for now"
     end
 
@@ -69,12 +74,9 @@ class BenchmarkDriver::Runner::Memory
     )
 
     with_script(benchmark.render) do |path|
-      output = IO.popen(['/usr/bin/time', *context.executable.command, path], err: [:child, :out], &:read)
+      output = IO.popen([*@time_command, *context.executable.command, path], err: [:child, :out], &:read)
       if $?.success?
-        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)
-        raise "Unexpected format given from /usr/bin/time:\n#{out}" unless match_data[:maxresident]
-
-        Integer(match_data[:maxresident]) * 1000.0 # kilobytes -> bytes
+        extract_maxresident_from_time_output(output)
       else
         $stdout.print(output)
         BenchmarkDriver::Result::ERROR
@@ -82,6 +84,20 @@ class BenchmarkDriver::Runner::Memory
     end
   end
 
+  def extract_maxresident_from_time_output(output)
+    case Etc.uname.fetch(:sysname)
+    when 'Linux'
+      pattern = /^(?<user>\d+.\d+)user\s+(?<system>\d+.\d+)system\s+(?<elapsed1>\d+):(?<elapsed2>\d+.\d+)elapsed.+\([^\s]+\s+(?<maxresident>\d+)maxresident\)k$/
+      scale = 1000.0 # kilobytes -> bytes
+    when 'Darwin'
+      pattern = /^\s+(?<real>\d+\.\d+)\s+real\s+(?<user>\d+\.\d+)\s+user\s+(?<system>\d+\.\d+)\s+sys$\s+(?<maxresident>\d+)\s+maximum resident set size$/
+      scale = 1.0
+    end
+    match_data = pattern.match(output)
+    raise "Unexpected format given from /usr/bin/time:\n#{out}" unless match_data[:maxresident]
+    Integer(match_data[:maxresident]) * scale
+  end
+
   def with_script(script)
     if @config.verbose >= 2
       sep = '-' * 30

data/lib/benchmark_driver/version.rb

@@ -1,3 +1,3 @@
 module BenchmarkDriver
-  VERSION = '0.14.12'
+  VERSION = '0.14.13'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: benchmark_driver
 version: !ruby/object:Gem::Version
-  version: 0.14.12
+  version: 0.14.13
 platform: ruby
 authors:
 - Takashi Kokubun
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-03 00:00:00.000000000 Z
+date: 2018-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler