benchcc 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c435cda71ad508017a69a33b232ef6a7ed334df8
-  data.tar.gz: c2c9a7bd9355414ea1388f7e792b630a3a0b79c8
+  metadata.gz: f076faa51fa97fb6499def81a757dd5f638ff415
+  data.tar.gz: 1c981a344f64ef8d2e38985073886b688564f9cd
 SHA512:
-  metadata.gz: da5d488a8e4cdb1984cb174c6b622dcba891d588bd734c9421f02dd6c412d1c243b307b09b0f4c3fba7476342a9acbfb520818abdbe80714dbebac666e9a4812
-  data.tar.gz: c5ab9643575c8d740e5521e8ed8ad04d78751488a30773b951a4bdb57a0fbf1319d75c4e3d3c4b6734f67647b2f394abd1ec9716907b9ebe3081479dc67a48aa
+  metadata.gz: 3664e71641c0d756424e76ca3f3a62c35888de6ab305ab6513f21891b9b1eb2947d78e6693ea0717d5e9e53a0971475a0d782bcebb9a16eaba1f08fa137e9288
+  data.tar.gz: aa2be5121dc575c61967e779b62a07e402ec1f9e73df108c68acfbf9a78f4272d09c0fe294cda0db312fddf5eccc29a8b67e0de2ff7520d4d4fa3da45021a935

data/lib/benchcc/compiler.rb

@@ -5,23 +5,40 @@ require 'tempfile'
 
 module Benchcc
   class CompilationError < RuntimeError
-    def initialize(command_line, code, compiler_error_message)
-      @cli = command_line
-      @code = code
-      @compiler_stderr = compiler_error_message
-    end
+  end
 
+  # Structure holding various information about the compilation of a file.
+  CompilationResult = Struct.new('CompilationResult',
+    # The time taken to compile.
+    :wall_time,
+    # The peak memory usage during compilation.
+    :peak_memusg,
+    # The standard error produced during compilation.
+    :stderr,
+    # The standard output produced during compilation.
+    :stdout,
+    # The input source that was compiled.
+    :code,
+    # The command line used for compilation.
+    :command_line
+  ) do
     def to_s
       <<-EOS
-  compilation failed when invoking "#{@cli}"
-  compiler error message was:
-  #{'-' * 80}
-  #{@compiler_stderr}
-
-  full compiled file was:
-  #{'-' * 80}
-  #{@code}
-  EOS
+command line: #{command_line}
+compilation time: #{wall_time}
+peak memory usage: #{peak_memusg}
+#{'=' * 30} [begin code] #{'=' * 30}
+#{code}
+#{'=' * 30} [end code] #{'=' * 30}
+
+#{'=' * 30} [begin stdout] #{'=' * 30}
+#{stdout}
+#{'=' * 30} [end stdout] #{'=' * 30}
+
+#{'=' * 30} [begin stderr] #{'=' * 30}
+#{stderr}
+#{'=' * 30} [end stderr] #{'=' * 30}
+EOS
     end
   end
 
@@ -42,7 +59,7 @@ module Benchcc
       raise NotImplementedError
     end
 
-    # compile_file: Path -> Hash
+    # compile_file: Path -> CompilationResult
     #
     # Compile the given file and return compilation statistics.
     #
@@ -57,7 +74,7 @@ module Benchcc
       compile_code(code, *args)
     end
 
-    # compile_code: String -> Hash
+    # compile_code: String -> CompilationResult
     #
     # Compile the given string and return compilation statistics.
     #
@@ -84,12 +101,17 @@ module Benchcc
       file = Pathname.new(file).expand_path
       command = "time -l #{@exe} #{args.join(' ')} -ftime-report #{file}"
       stdout, stderr, status = Open3.capture3(command)
-      raise CompilationError.new(command, file.read, stderr) unless status.success?
 
-      return {
-        peak_memusg: stderr.match(/(\d+)\s+maximum/)[1].to_i,
-        wall_time: stderr.match(/.+Total/).to_s.split[-3].to_f
-      }
+      result = CompilationResult.new
+      result.stderr = stderr
+      result.stdout = stdout
+      result.code = file.read
+      result.command_line = command
+      raise CompilationError.new(result) unless status.success?
+
+      result.peak_memusg = stderr.match(/(\d+)\s+maximum/)[1].to_i
+      result.wall_time = stderr.match(/.+Total/).to_s.split[-3].to_f
+      return result
     end
 
     def template_depth;  256; end
@@ -106,12 +128,17 @@ module Benchcc
       file = Pathname.new(file).expand_path
       command = "time -l #{@exe} #{args.join(' ')} -ftime-report #{file}"
       stdout, stderr, status = Open3.capture3(command)
-      raise CompilationError.new(command, file.read, stderr) unless status.success?
 
-      return {
-        peak_memusg: stderr.match(/(\d+)\s+maximum/)[1].to_i,
-        wall_time: stderr.match(/TOTAL.+/).to_s.split[-3].to_f
-      }
+      result = CompilationResult.new
+      result.stderr = stderr
+      result.stdout = stdout
+      result.code = file.read
+      result.command_line = command
+      raise CompilationError.new(result) unless status.success?
+
+      result.peak_memusg = stderr.match(/(\d+)\s+maximum/)[1].to_i
+      result.wall_time = stderr.match(/TOTAL.+/).to_s.split[-3].to_f
+      return result
     end
 
     def template_depth;  900; end

data/lib/benchcc/version.rb

@@ -1,3 +1,3 @@
 module Benchcc
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/compiler_spec.rb

@@ -60,9 +60,7 @@ end
       }
 
       it('returns statistics on valid input') {
-        result = @cc.compile_file(@valid, '-o /dev/null')
-        expect(result).to have_key(:peak_memusg)
-        expect(result).to have_key(:wall_time)
+        expect(@cc.compile_file(@valid, '-o /dev/null')).to be_instance_of(Benchcc::CompilationResult)
       }
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: benchcc
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Louis Dionne