binaryen 1.1.6.10 → 1.1.6.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7a03d6e05a577d6579506e64e603e11f9430bf4d4f19c4d3f5cf0e984ad78387
-  data.tar.gz: c2995a3d92c07731d5b54b832c0d838159aebd2770dc1b4e0155bcc09ef2e7a8
+  metadata.gz: d2514a32fe0aa37ddffcc4da057a610ccac94f7e4a43318b3979d3c72788b165
+  data.tar.gz: 6da6579ae2cdba43f375ed3795e41da20b12e4854ed9c3c22b43bd92cb6fa8e7
 SHA512:
-  metadata.gz: 01cdacd58083894fd4356f23032b00c00a4f586ac4d141742a50471228d772623027178e2b93879d9d224b3dc98fcdeb5c90374700914a7021752acbdaa78720
-  data.tar.gz: cfddf72d19ad3922e7152ec150d1ce31a936b54f25e1638674be47d453dd808353110ec481749977bd54a78369b2db3c7331342af7ae918a9cbef447261ec3f9
+  metadata.gz: 8d0c1f916e3e38511bac7e28325f20e8dabec9666bd154f14d06a6c346640431596d44d0c63f603966f470a4c526037c9a29d2c70172605ffb3690af56cfcbf7
+  data.tar.gz: 4ddc9df067ee8354a995a9cf7eb09ea27ce54455dd266266149192e2c45564f1969c21f601f719f3ff45e34a2649e490c09aee28118c1b24a1a283458302e70b

data/lib/binaryen/command.rb

@@ -9,10 +9,7 @@ module Binaryen
     include POSIX::Spawn
     DEFAULT_MAX_OUTPUT_SIZE = 256 * 1024 * 1024 * 1024 # 256 MiB
     DEFAULT_TIMEOUT = 10
-    DEFAULT_ARGS_FOR_COMMAND = {
-      "wasm-opt" => ["--output=-"],
-    }.freeze
-    BUFSIZE = 32 * 1024
+    DEFAULT_ARGS_FOR_COMMAND = {}.freeze
 
     def initialize(cmd, timeout: DEFAULT_TIMEOUT, max_output_size: DEFAULT_MAX_OUTPUT_SIZE, ignore_missing: false)
       @cmd = command_path(cmd, ignore_missing) || raise(ArgumentError, "command not found: #{cmd}")
@@ -23,82 +20,70 @@ module Binaryen
 
     def run(*arguments, stdin: nil, stderr: nil)
       args = [@cmd] + arguments + @default_args
-
-      if stdin
-        with_stdin_tempfile(stdin) { |path| spawn_command(*args, path, stderr: stderr) }
-      else
-        spawn_command(*args, stderr: stderr)
+      Timeout.timeout(@timeout) do
+        spawn_command(*args, stderr: stderr, stdin: stdin)
       end
     end
 
     private
 
-    def with_stdin_tempfile(content)
-      Tempfile.open("binaryen-stdin") do |f|
-        f.binmode
-        f.write(content)
-        f.close
-        yield f.path
-      end
-    end
-
     def command_path(cmd, ignore_missing)
       Dir[File.join(Binaryen.bindir, cmd)].first || (ignore_missing && cmd)
     end
 
-    def spawn_command(*args, stderr: nil)
-      out = "".b
-      start_time = Process.clock_gettime(Process::CLOCK_MONOTONIC)
-      pid, stdin, stdout, stderr_stream = popen4(*args)
-      stdin.close
-      readers = [stdout, stderr_stream]
-
-      while readers.any?
-        elapsed_time = Process.clock_gettime(Process::CLOCK_MONOTONIC) - start_time
-        remaining_time = @timeout - elapsed_time
-        ready = IO.select(readers, nil, nil, remaining_time)
-        raise Timeout::Error, "command timed out after #{@timeout} seconds" if ready.nil?
-
-        ready[0].each do |io|
-          data = io.read_nonblock(BUFSIZE, exception: false)
-
-          if data == :wait_readable
-            # If the IO object is not ready for reading, read_nonblock returns :wait_readable.
-            # This isn't an error, but a notification.
-          elsif data.nil?
-            # At EOF, read_nonblock returns nil instead of raising EOFError.
-            readers.delete(io)
-            io.close
-          elsif io == stdout
-            out << data
-          elsif io == stderr_stream && stderr
-            stderr << data
-          end
-        rescue Errno::EINTR
-          # This means that the read was interrupted by a signal, which is not an error. So we just retry.
-        end
+    def spawn_command(*args, stderr: nil, stdin: nil)
+      pid = nil
 
-        if out.bytesize > @max_output_size
-          Process.kill("TERM", pid)
-          raise Binaryen::MaximumOutputExceeded, "maximum output size exceeded (#{@max_output_size} bytes)"
-        end
+      IO.pipe do |in_read, in_write|
+        in_read.binmode
+        in_write.binmode
 
-        if remaining_time < 0
-          Process.kill("TERM", pid)
-          raise Timeout::Error, "command timed out after #{@timeout} seconds"
-        end
-      end
+        Tempfile.create("binaryen") do |tmpfile|
+          tmpfile.close
+
+          File.open(File::NULL, "w") do |devnull|
+            IO.pipe do |err_read, err_write|
+              pid = POSIX::Spawn.pspawn(*args, "--output=#{tmpfile.path}", in: in_read, out: devnull, err: err_write)
+              in_read.close
+              err_write.close
+
+              in_write.write(stdin) if stdin
+              in_write.close
+
+              _, status = Process.waitpid2(pid)
+              pid = nil
 
-      _, status = Process.waitpid2(pid, Process::WUNTRACED)
+              stderr&.write(err_read.read)
+              err_read.close
 
-      raise Binaryen::NonZeroExitStatus, "command exited with status #{status.exitstatus}" unless status.success?
+              if status.signaled?
+                raise Binaryen::Signal, "command terminated by signal #{status.termsig}"
+              elsif status.exited? && !status.success?
+                raise Binaryen::NonZeroExitStatus, "command exited with status #{status.exitstatus}"
+              elsif File.size(tmpfile.path) > @max_output_size
+                raise Binaryen::MaximumOutputExceeded, "maximum output size exceeded (#{@max_output_size} bytes)"
+              end
 
-      out
-    ensure
-      [stdin, stdout, stderr_stream].each do |io|
-        io.close
-      rescue
-        nil
+              File.binread(tmpfile.path)
+            end
+          end
+        rescue
+          if pid
+            begin
+              Process.kill(:KILL, pid)
+            rescue SystemCallError
+              # Expected
+            end
+
+            begin
+              Process.wait(pid, Process::WNOHANG)
+            rescue SystemCallError
+              # Expected
+            end
+          end
+
+          raise
+        end
       end
     end
   end

data/lib/binaryen/error.rb

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

data/lib/binaryen/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module Binaryen
-  VERSION = "1.1.6.10"
+  VERSION = "1.1.6.11"
   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.10
+  version: 1.1.6.11
 platform: ruby
 authors:
 - Shopify Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-01-09 00:00:00.000000000 Z
+date: 2024-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: posix-spawn