grntest 1.6.9 → 1.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 874f9b46d80e926dac44a36947f89cb2f8fee99a1e00ae1063b5e3d79b07d706
-  data.tar.gz: 44643f5dc0b404cbfde294a218f19a0251afef70c01ae6d8a9ab3130556af3e3
+  metadata.gz: 7175e168334b0747450ac82d996961d56921fd71cb3570dd79c087f1ed12ccb9
+  data.tar.gz: 374847e51cc75585df02626162347cf1b96d0c774cc65379c7b9e3a782ad5f5a
 SHA512:
-  metadata.gz: 13b411cbd6573214a097ca372a9e0a810b81c485dd4a241030996f3030561082a82939f278417ec2eb213e64505a9dab4c693130403ee30c557cc73b58f9915e
-  data.tar.gz: 7ae1e11e823be0eda76acc7e0af1f11d168e2859287c4cfb435ffd69b0dd034a6065befab670997972eca56dbb1d769e8756705edc505bb51a3cf42f6e8a8abd
+  metadata.gz: 79e28ea7a29e3b6a2bbed57c80d5f284dbf737e91d9963ff3b7c8063dfb1b850021f65a66a589f182d76aab5b3d6e1ce91d877d0634d76b0f16d3164df8cea35
+  data.tar.gz: 6d2ed0c3743e99d7ec2219c80618ff5f3959389bb675fe49f747d579bcd413c0fc42aa3e3e61fbff82848b953a8828386eb139ec47089fb9ada556ea9370f6d1

data/doc/text/news.md

@@ -1,5 +1,18 @@
 # News
 
+## 1.7.1: 2024-02-05
+
+### Improvements
+
+  * benchmark: Removed load preparation part from elapsed time.
+
+## 1.7.0: 2024-02-05
+
+### Fixes
+
+  * reporter: benchmark-json: Fixed a bug that invalid JSON may be
+    generated.
+
 ## 1.6.9: 2024-02-05
 
 ### Improvements

data/lib/grntest/base-result.rb

@@ -29,12 +29,12 @@ module Grntest
     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

data/lib/grntest/executors/base-executor.rb

@@ -646,11 +646,9 @@ module Grntest
         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

data/lib/grntest/executors/http-executor.rb

@@ -127,15 +127,17 @@ module Grntest
         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 @@ module Grntest
           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
 

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

@@ -29,16 +29,18 @@ module Grntest
         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

data/lib/grntest/reporters/benchmark-json-reporter.rb

@@ -21,10 +21,6 @@ require "grntest/reporters/base-reporter"
 module Grntest
   module Reporters
     class BenchmarkJSONReporter < BaseReporter
-      def initialize(tester)
-        super
-      end
-
       def on_start(result)
         puts(<<-JSON)
 {
@@ -40,11 +36,12 @@ module Grntest
     "mhz_per_cpu": #{cpu_cycles_per_second / 1_000_000.0},
           JSON
         end
-        puts(<<-JSON)
+        print(<<-JSON.chomp)
     "caches": []
   },
   "benchmarks": [
         JSON
+        @first_benchmark = true
       end
 
       def on_worker_start(worker)
@@ -79,6 +76,8 @@ module Grntest
 
       def on_test_finish(worker, result)
         return if result.benchmarks.empty?
+        print(",") unless @first_benchmark
+        puts
         benchmarks = result.benchmarks.collect do |benchmark|
           name = "#{worker.suite_name}/#{result.test_name}"
           <<-JSON.chomp
@@ -94,7 +93,8 @@ module Grntest
     }
           JSON
         end
-        puts(benchmarks.join(",\n"))
+        print(benchmarks.join(",\n"))
+        @first_benchmark = false
       end
 
       def on_suite_finish(worker)
@@ -104,6 +104,7 @@ module Grntest
       end
 
       def on_finish(result)
+        puts
         puts(<<-JSON)
   ]
 }

data/lib/grntest/version.rb

@@ -14,5 +14,5 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 module Grntest
-  VERSION = "1.6.9"
+  VERSION = "1.7.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: grntest
 version: !ruby/object:Gem::Version
-  version: 1.6.9
+  version: 1.7.1
 platform: ruby
 authors:
 - Kouhei Sutou
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-05 00:00:00.000000000 Z
+date: 2024-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diff-lcs