lib/rgot/b.rb in rgot-0.0.5 vs lib/rgot/b.rb in rgot-0.1.0

@@ -1,9 +1,15 @@
 module Rgot
   class B < Common
+    class Options < Struct.new(
+      :procs,
+      :threads,
+      :benchtime
+    ); end
+
     attr_accessor :n
-    def initialize(benchmark_module, name, opts={})
+    def initialize(benchmark_module, name, opts=Options.new)
       super()
       @n = 1
       @module = benchmark_module
       @name = name
       @opts = opts
@@ -33,53 +39,57 @@
       @duration = 0
     end
 
     def run(&block)
       n = 1
-      benchtime = @opts.fetch(:benchtime, 1).to_f
-      run_n(n.to_i, block)
-      while !failed? && @duration < benchtime && @n < 1e9
-        if @duration < (benchtime / 100.0)
-          @n *= 100
-        elsif @duration < (benchtime / 10.0)
-          @n *= 10
-        elsif @duration < (benchtime / 5.0)
-          @n *= 5
-        elsif @duration < (benchtime / 2.0)
-          @n *= 2
-        else
-          if @n.to_i == 1
-            break
+      benchtime = (@opts.benchtime || 1).to_f
+      catch(:skip) {
+        run_n(n.to_i, block)
+        while !failed? && @duration < benchtime && @n < 1e9
+          if @duration < (benchtime / 100.0)
+            @n *= 100
+          elsif @duration < (benchtime / 10.0)
+            @n *= 10
+          elsif @duration < (benchtime / 5.0)
+            @n *= 5
+          elsif @duration < (benchtime / 2.0)
+            @n *= 2
+          else
+            if @n.to_i == 1
+              break
+            end
+            @n *= 1.2
           end
-          @n *= 1.2
+          run_n(@n.to_i, block)
         end
-        run_n(@n.to_i, block)
-      end
+      }
 
       BenchmarkResult.new(n: @n, t: @duration)
     end
 
     def run_parallel
       raise LocalJumpError, "no block given" unless block_given?
 
-      @opts[:procs].times do
+      procs = (@opts.procs || 1)
+      threads = (@opts.threads || 1)
+
+      procs.times do
         fork {
-          Array.new(@opts[:threads]) {
+          Array.new(threads) {
             Thread.new {
               yield PB.new(bn: @n)
             }.tap { |t| t.abort_on_exception = true }
           }.each(&:join)
         }
       end
-      @n *= @opts[:procs] * @opts[:threads]
+      @n *= procs * threads
       Process.waitall
     end
 
     private
 
     def run_n(n, block=nil)
       GC.start
-      i = 0
       @n = n
       reset_timer
       start_timer
       if block
         block.call(self)