WIP

Author: AriaXLi

lib/puppet/util.rb

@@ -514,9 +514,10 @@ def symbolizehash(hash)
 
   # Just benchmark, with no logging.
   def thinmark
-    Benchmark.realtime {
-      yield
-    }
+    start = Process.clock_gettime(Process::CLOCK_MONOTONIC, :float_second)
+    yield
+    stop = Process.clock_gettime(Process::CLOCK_MONOTONIC, :float_second)
+    elapsed = stop - start # elapsed time to execute yield
   end
 
   module_function :thinmark

lib/puppet/util/profiler/aggregate.rb

@@ -72,11 +72,11 @@ def add_time(time)
 
   class Timer
     def initialize
-      @start = Time.now
+      @start = Process.clock_gettime(Process::CLOCK_MONOTONIC, :float_second)
     end
 
     def stop
-      Time.now - @start
+      Process.clock_gettime(Process::CLOCK_MONOTONIC, :float_second) - @start
     end
   end
 end

lib/puppet/util/profiler/wall_clock.rb

@@ -21,11 +21,11 @@ class Timer
     FOUR_DECIMAL_DIGITS = '%0.4f'
 
     def initialize
-      @start = Time.now
+      @start = Process.clock_gettime(Process::CLOCK_MONOTONIC, :float_second)
     end
 
     def stop
-      @time = Time.now - @start
+      @time = Process.clock_gettime(Process::CLOCK_MONOTONIC, :float_second) - @start
       @time
     end
 

spec/unit/transaction/report_spec.rb

@@ -580,8 +580,8 @@ def add_statuses(count, type = :file)
 
     it 'should sort total at the very end of the time metrics' do
       expect(@report.summary).to match(/
-         Last run: \d+
    Transaction evaluation: \d+.\d{2}
+         Last run: \d+
             Total: \d+.\d{2}
 Version:
 /)