binaryen 1.1.6.1 → 1.1.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f28c12d0f3983f4a8856a70bd62767df1021eac072a97edea0174b59648519d1
-  data.tar.gz: 6973598a0a4d375e1445a6d463853b6a37a4343b735c191fa10b7457cdb4273e
+  metadata.gz: 502cfbb2e9e33d3b32d5ab1881bf097fc7321bcb8746e2ae4b4142a6dbe3727a
+  data.tar.gz: 20c543218c8b5c256012e3b386e4cf6ceda9461899f10d990edcba0b983dbc17
 SHA512:
-  metadata.gz: 31693bb150232527b2ebae35f6a44f72d3af7a02ec3d6370df366226eb7e4b718375db2c832f6fe169a843c1c4b4ced9116d0d4e247a4805d473c01f8d9677a9
-  data.tar.gz: feac4bb36b20f5b5e0d7907fb2cad013e2c90c23bb5cdb7b233ca0e74407ab558de9f765b2bd8adcbe9148976363b1dca9781b6dbf37dead3f0dac867c36eaad
+  metadata.gz: 2a9d8542c524badbeb6721a9b6e9fc6cd9531e3a44134bce6206cba23c99c1d069850f85e0e222a0749de571d647e57a6f122dba6992661ef819f884581c7bcf
+  data.tar.gz: e62fa41cc97a4d777e10872d4ec9df6690ca5a5c6d773d8e01de897b93e41880e6bd676a5756776bbdf91629977402c6dec8f7e269a2c32909f1b62143773ba5

data/lib/binaryen/command.rb

@@ -18,6 +18,23 @@ module Binaryen
       "wasm-opt" => ["--output=-"],
     }.freeze
 
+    class TimeoutChecker
+      def initialize(end_time:, pid:)
+        @end_time = end_time
+        @pid = pid
+      end
+
+      def check!
+        now = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+        if now >= @end_time
+          Process.kill("KILL", @pid)
+          raise Timeout::Error, "Command timed out"
+        end
+        remaining_time = @end_time - now
+        remaining_time
+      end
+    end
+
     def initialize(cmd, timeout: 10, ignore_missing: false)
       @cmd = command_path(cmd, ignore_missing) || raise(ArgumentError, "command not found: #{cmd}")
       @timeout = timeout
@@ -25,58 +42,49 @@ module Binaryen
     end
 
     def run(*arguments, stdin: nil, stderr: File::NULL)
+      end_time = Process.clock_gettime(Process::CLOCK_MONOTONIC) + @timeout
       command = build_command(*arguments)
       pipe = IO.popen(command, "rb+", err: stderr)
       pid = pipe.pid
-      start_time = Process.clock_gettime(Process::CLOCK_MONOTONIC)
-      remaining_timeout = @timeout
-
-      if stdin
-        start_time, remaining_timeout = write_to_pipe(pipe, stdin, start_time, remaining_timeout)
-      end
+      timeout_checker = TimeoutChecker.new(end_time: end_time, pid: pid)
 
-      output, remaining_timeout = read_from_pipe(pipe, start_time, remaining_timeout)
-
-      wait_or_kill(pid, start_time, remaining_timeout)
+      write_to_pipe(pipe, stdin, timeout_checker) if stdin
+      output = read_from_pipe(pipe, timeout_checker)
+      wait_or_kill(pid, timeout_checker)
 
       output
     end
 
     private
 
-    def write_to_pipe(pipe, stdin, start_time, remaining_timeout)
+    def write_to_pipe(pipe, stdin, timeout_checker)
       offset = 0
       length = stdin.bytesize
 
       while offset < length
-        start_time, remaining_timeout = update_timeout(start_time, remaining_timeout)
-        if IO.select(nil, [pipe], nil, remaining_timeout)
+        remaining_time = timeout_checker.check!
+
+        if IO.select(nil, [pipe], nil, remaining_time)
           written = pipe.write_nonblock(stdin.byteslice(offset, length), exception: false)
-          case written
-          when Integer
-            offset += written
-          when :wait_writable
-            puts "wait"
-            # If the pipe is not ready for writing, retry
-          end
+          offset += written if written.is_a?(Integer)
         else
           raise Timeout::Error, "Command timed out"
         end
       end
 
       pipe.close_write
-      [start_time, remaining_timeout]
     end
 
-    def read_from_pipe(pipe, start_time, remaining_timeout)
+    def read_from_pipe(pipe, timeout_checker)
       output = +""
 
       while (result = pipe.read_nonblock(8192, exception: false))
-        start_time, remaining_timeout = update_timeout(start_time, remaining_timeout)
+        remaining_time = timeout_checker.check!
+        raise Timeout::Error, "Command timed out" if remaining_time <= 0
 
         case result
         when :wait_readable
-          IO.select([pipe], nil, nil, remaining_timeout)
+          IO.select([pipe], nil, nil, remaining_time)
         when nil
           break
         else
@@ -84,37 +92,22 @@ module Binaryen
         end
       end
 
-      [output, remaining_timeout]
-    end
-
-    def update_timeout(start_time, remaining_timeout)
-      elapsed_time = Process.clock_gettime(Process::CLOCK_MONOTONIC) - start_time
-      remaining_timeout -= elapsed_time
-
-      raise Timeout::Error, "command timed out" if remaining_timeout <= 0
-
-      start_time = Process.clock_gettime(Process::CLOCK_MONOTONIC)
-
-      [start_time, remaining_timeout]
+      output
     end
 
-    def wait_or_kill(pid, start_time, remaining_timeout)
-      while remaining_timeout > 0
-        start_time, remaining_timeout = update_timeout(start_time, remaining_timeout)
+    def wait_or_kill(pid, timeout_checker)
+      loop do
+        remaining_time = timeout_checker.check!
+        raise Timeout::Error, "timed out waiting on process" if remaining_time <= 0
 
         if (_, status = Process.wait2(pid, Process::WNOHANG))
-          if status.exitstatus != 0
-            raise Binaryen::NonZeroExitStatus, "command exited with status #{status.exitstatus}"
-          end
+          raise Binaryen::NonZeroExitStatus, "command exited with status #{status.exitstatus}" if status.exitstatus != 0
 
           return true
         else
           sleep(0.1)
         end
       end
-
-      Process.kill("KILL", pid)
-      raise Timeout::Error, "timed out waiting on process"
     end
 
     def build_command(*arguments)

data/lib/binaryen/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module Binaryen
-  VERSION = "1.1.6.1"
+  VERSION = "1.1.6.2"
   BINARYEN_VERSION = "version_116"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: binaryen
 version: !ruby/object:Gem::Version
-  version: 1.1.6.1
+  version: 1.1.6.2
 platform: ruby
 authors:
 - Shopify Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-12-02 00:00:00.000000000 Z
+date: 2023-12-11 00:00:00.000000000 Z
 dependencies: []
 description: 
 email:
@@ -92,7 +92,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.21
+rubygems_version: 3.4.22
 signing_key: 
 specification_version: 4
 summary: Vendors binaryen libraries, headers, and executables for use in Ruby