binaryen 1.1.6.5 → 1.1.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ec6cd19949163f81747301353e37912f7d2924205816df9f6620f0cb6a266ce
-  data.tar.gz: cfc6e449979a806440f5c893640618bd321597e1ae8848108fea8c7b9da88d72
+  metadata.gz: e208c99114153cd5edae8ca1125d26eeecb8f2b5f91e218ccc63f807827ee4fe
+  data.tar.gz: 6839fedb4b0c710fc1aa852909f3a24daf1729a2f1531e6c3c47b7594f2819d3
 SHA512:
-  metadata.gz: 9e83c357446ac3c2e04d6de7a575d8dca7b4164cd4050416edd87d23fe864165085f25b5e3f7a7f28d46debedcc7fa146f1416aa8a529376c5ea07dfd8f1713b
-  data.tar.gz: 8f3e7d8a8582608436191bdea891aa8564cebc0ccceceb750bdbce38b563bd590c32e8b5025a9a63761eb6592347709e06983c023b950d377b016354da111b35
+  metadata.gz: 21ec4f01eacfa0d38b08acae723f5f6bf662f42047950354c3260b9d461b774ba91749b82b162a74b83ef0e70aa4b6541fcbbbb70111cd30b11b969955a2cfec
+  data.tar.gz: 5dbbf03fe6f8325cdaa1e78c81bfb7feef07d1887d53a647202f56dc58e5ac1b628a2057f0e5cce083bd2868894e622054f1a999d476a568ef04a5c1558a2d72

data/lib/binaryen/command.rb

@@ -15,29 +15,11 @@ module Binaryen
   #   optimized_wasm = command.run("-O4", stdin: "(module)")
   #   ```
   class Command
-    include POSIX::Spawn
-
+    MAX_OUTPUT_SIZE = 256 * 1024 * 1024
     DEFAULT_ARGS_FOR_COMMAND = {
       "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
@@ -45,87 +27,22 @@ module Binaryen
     end
 
     def run(*arguments, stdin: nil, stderr: nil)
-      end_time = Process.clock_gettime(Process::CLOCK_MONOTONIC) + @timeout
-      command = build_command(*arguments)
-      pid, iwr, ord, erd = popen4(*command)
-      timeout_checker = TimeoutChecker.new(end_time: end_time, pid: pid)
+      args = [@cmd] + arguments + @default_args
+      child = POSIX::Spawn::Child.new(*args, input: stdin, timeout: @timeout, max: MAX_OUTPUT_SIZE)
+      stderr&.write(child.err)
+      status = child.status
 
-      write_to_pipe(iwr, stdin, timeout_checker) 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
-      end
-      output = read_from_pipe(ord, timeout_checker)
-      wait_or_kill(pid, timeout_checker, erd, stderr)
+      raise Binaryen::NonZeroExitStatus, "command exited with status #{status.exitstatus}" unless status.success?
 
-      output
+      child.out
+    rescue POSIX::Spawn::MaximumOutputExceeded => e
+      raise Binaryen::MaximumOutputExceeded, e.message
+    rescue POSIX::Spawn::TimeoutExceeded => e
+      raise Timeout::Error, e.message
     end
 
     private
 
-    def write_to_pipe(pipe, stdin, timeout_checker, close_write: true)
-      offset = 0
-      length = stdin.bytesize
-
-      while offset < length
-        remaining_time = timeout_checker.check!
-
-        if IO.select(nil, [pipe], nil, remaining_time)
-          written = pipe.write_nonblock(stdin.byteslice(offset, length), exception: false)
-          offset += written if written.is_a?(Integer)
-        else
-          raise Timeout::Error, "Command timed out"
-        end
-      end
-
-      pipe.close_write if close_write
-    end
-
-    def read_from_pipe(pipe, timeout_checker)
-      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
-          IO.select([pipe], nil, nil, remaining_time)
-        when nil
-          break
-        else
-          output << result
-        end
-      end
-
-      output
-    end
-
-    def wait_or_kill(pid, timeout_checker, err_read, err_write)
-      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))
-
-          raise Binaryen::NonZeroExitStatus,
-            "command exited with status #{status.exitstatus}" if status.exitstatus != 0
-
-          return true
-        else
-          sleep(0.1)
-        end
-      end
-    end
-
-    def build_command(*arguments)
-      [@cmd] + arguments + @default_args
-    end
-
     def command_path(cmd, ignore_missing)
       Dir[File.join(Binaryen.bindir, cmd)].first || (ignore_missing && cmd)
     end

data/lib/binaryen/error.rb

@@ -3,4 +3,5 @@
 module Binaryen
   class Error < StandardError; end
   class NonZeroExitStatus < Error; end
+  class MaximumOutputExceeded < Error; end
 end

data/lib/binaryen/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module Binaryen
-  VERSION = "1.1.6.5"
+  VERSION = "1.1.6.7"
   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.7
 platform: ruby
 authors:
 - Shopify Inc.