Don't measure preparation time

lib/grntest/base-result.rb

@@ -29,12 +29,12 @@ def measure
     ensure
       cpu_finish_time = Process.times
       real_finish_time = Process.clock_gettime(Process::CLOCK_MONOTONIC)
-      @cpu_elapsed_time =
+      @cpu_elapsed_time +=
         (cpu_finish_time.utime - cpu_start_time.utime) +
         (cpu_finish_time.stime - cpu_start_time.stime) +
         (cpu_finish_time.cutime - cpu_start_time.cutime) +
         (cpu_finish_time.cstime - cpu_start_time.cstime)
-      @real_elapsed_time = real_finish_time - real_start_time
+      @real_elapsed_time += real_finish_time - real_start_time
     end
   end
 end

lib/grntest/executors/base-executor.rb

@@ -646,11 +646,9 @@ def execute_command(command)
         timeout = @context.timeout
         response = nil
         begin
-          @benchmark_result.measure do
-            @benchmark_result.n_iterations.times do
-              Timeout.timeout(timeout) do
-                response = send_command(command)
-              end
+          @benchmark_result.n_iterations.times do
+            Timeout.timeout(timeout) do
+              response = send_command(command)
             end
           end
         rescue Timeout::Error

lib/grntest/executors/http-executor.rb

@@ -127,15 +127,17 @@ def send_load_command(command)
         request = Net::HTTP::Post.new(path)
         request.content_type = content_type
         set_request_body(request, body)
-        run_http_request(url) do
-          http = Net::HTTP.new(@host, @port)
-          http.set_debug_output($stderr) if LOAD_DEBUG
-          response = http.start do
-            http.read_timeout = read_timeout
-            http.request(request)
+        @benchmark_result.measure do
+          run_http_request(url) do
+            http = Net::HTTP.new(@host, @port)
+            http.set_debug_output($stderr) if LOAD_DEBUG
+            response = http.start do
+              http.read_timeout = read_timeout
+              http.request(request)
+            end
+            check_response(response)
+            normalize_response_data(command, response.body)
           end
-          check_response(response)
-          normalize_response_data(command, response.body)
         end
       end
 
@@ -150,15 +152,17 @@ def send_normal_command(command)
           request = Net::HTTP::Get.new(path_with_query)
         end
         url = "http://#{@host}:#{@port}#{path_with_query}"
-        run_http_request(url) do
-          http = Net::HTTP.new(@host, @port)
-          http.set_debug_output($stderr) if DEBUG
-          response = http.start do
-            http.read_timeout = read_timeout
-            http.request(request)
+        @benchmark_result.measure do
+          run_http_request(url) do
+            http = Net::HTTP.new(@host, @port)
+            http.set_debug_output($stderr) if DEBUG
+            response = http.start do
+              http.read_timeout = read_timeout
+              http.request(request)
+            end
+            check_response(response)
+            normalize_response_data(command, response.body)
           end
-          check_response(response)
-          normalize_response_data(command, response.body)
         end
       end
 

lib/grntest/executors/standard-io-executor.rb

@@ -29,16 +29,18 @@ def send_command(command)
         if !command.key?(:output_type) and @output_type
           command_line = command_line.sub(/$/, " --output_type #{@output_type}")
         end
-        begin
-          debug_input(command_line)
-          @input.print(command_line)
-          @input.print("\n")
-          @input.flush
-        rescue SystemCallError
-          message = "failed to write to groonga: <#{command_line}>: #{$!}"
-          raise Error.new(message)
+        @benchmark_result.measure do
+          begin
+            debug_input(command_line)
+            @input.print(command_line)
+            @input.print("\n")
+            @input.flush
+          rescue SystemCallError
+            message = "failed to write to groonga: <#{command_line}>: #{$!}"
+            raise Error.new(message)
+          end
+          read_output(command)
         end
-        read_output(command)
       end
 
       def ensure_groonga_ready