binaryen 1.1.6.5 → 1.1.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ec6cd19949163f81747301353e37912f7d2924205816df9f6620f0cb6a266ce
-  data.tar.gz: cfc6e449979a806440f5c893640618bd321597e1ae8848108fea8c7b9da88d72
+  metadata.gz: 44bf5b373ce186bdee3006d16e8129bde2be3e952c1211d3ee550fb529cffbfe
+  data.tar.gz: c3ef7a60460cdc937e51b538ef4e6d94ebfba2167ff14821292881a9b91d6f1f
 SHA512:
-  metadata.gz: 9e83c357446ac3c2e04d6de7a575d8dca7b4164cd4050416edd87d23fe864165085f25b5e3f7a7f28d46debedcc7fa146f1416aa8a529376c5ea07dfd8f1713b
-  data.tar.gz: 8f3e7d8a8582608436191bdea891aa8564cebc0ccceceb750bdbce38b563bd590c32e8b5025a9a63761eb6592347709e06983c023b950d377b016354da111b35
+  metadata.gz: 290897e4df9079e57df51b4b684fa5ae496ea414c44d801ed8d2be5c167d5347812533511ee26b8f59520d645df1072df5c6368d218ab824d89b38e07373e7b5
+  data.tar.gz: c30ed5adcb899a8d938d211b3aa3e98e875ec061f19054efd5d7a803b9be0392f9215cbac61283147841e23171ead48391f06695aa06841a64a6be05d5ba57aa

data/lib/binaryen/command.rb

@@ -30,7 +30,7 @@ module Binaryen
       def check!
         now = Process.clock_gettime(Process::CLOCK_MONOTONIC)
         if now >= @end_time
-          Process.kill("KILL", @pid)
+          Process.kill("TERM", @pid)
           raise Timeout::Error, "Command timed out"
         end
         remaining_time = @end_time - now
@@ -50,47 +50,45 @@ module Binaryen
       pid, iwr, ord, erd = popen4(*command)
       timeout_checker = TimeoutChecker.new(end_time: end_time, pid: pid)
 
-      write_to_pipe(iwr, stdin, timeout_checker) if stdin
+      write_to_pipe(iwr, stdin, timeout_checker, pid) if stdin
+
       if stderr
         err_output = read_from_pipe(erd, timeout_checker)
-        begin
-          write_to_pipe(stderr, err_output, timeout_checker, close_write: false)
-        rescue Errno::EPIPE
-          # ignore
-        end
+        write_to_pipe(stderr, err_output, timeout_checker, pid, close_write: false)
       end
       output = read_from_pipe(ord, timeout_checker)
-      wait_or_kill(pid, timeout_checker, erd, stderr)
+      wait_or_kill(pid, timeout_checker)
 
       output
     end
 
     private
 
-    def write_to_pipe(pipe, stdin, timeout_checker, close_write: true)
+    def write_to_pipe(pipe, stdin, timeout_checker, pid, close_write: true)
       offset = 0
       length = stdin.bytesize
 
       while offset < length
         remaining_time = timeout_checker.check!
 
-        if IO.select(nil, [pipe], nil, remaining_time)
+        next unless IO.select(nil, [pipe], nil, remaining_time)
+
+        begin
           written = pipe.write_nonblock(stdin.byteslice(offset, length), exception: false)
           offset += written if written.is_a?(Integer)
-        else
-          raise Timeout::Error, "Command timed out"
+        rescue Errno::EPIPE
+          wait_or_kill(pid, timeout_checker, pid)
         end
       end
-
+    ensure
       pipe.close_write if close_write
     end
 
-    def read_from_pipe(pipe, timeout_checker)
+    def read_from_pipe(pipe, timeout_checker, close_read: true)
       output = +""
 
       while (result = pipe.read_nonblock(8192, exception: false))
         remaining_time = timeout_checker.check!
-        raise Timeout::Error, "Command timed out" if remaining_time <= 0
 
         case result
         when :wait_readable
@@ -103,15 +101,15 @@ module Binaryen
       end
 
       output
+    ensure
+      pipe.close_read if close_read
     end
 
-    def wait_or_kill(pid, timeout_checker, err_read, err_write)
+    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
+        timeout_checker.check!
 
         if (_, status = Process.wait2(pid, Process::WNOHANG))
-
           raise Binaryen::NonZeroExitStatus,
             "command exited with status #{status.exitstatus}" if status.exitstatus != 0
 

data/lib/binaryen/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: binaryen
 version: !ruby/object:Gem::Version
-  version: 1.1.6.5
+  version: 1.1.6.6
 platform: ruby
 authors:
 - Shopify Inc.