[GR-41105] Fix IO#{wait,wait_readable,wait_writable} with a timeout > INT_MAX seconds

PullRequest: truffleruby/3495

Author: eregon

CHANGELOG.md

@@ -17,6 +17,7 @@ Bug fixes:
 * Disallow the marshaling of polyglot exceptions since we can't properly reconstruct them (@nirvdrum).
 * Fix `String#split` missing a value in its return array when called with a pattern of `" "` and a _limit_ value > 0 on a string with trailing whitespace where the limit hasn't been met (@nirvdrum).
 * Fix `Kernel#sleep` and `Mutex#sleep` for durations smaller than 1 millisecond (#2716, @eregon).
+* Fix `IO#{wait,wait_readable,wait_writable}` with a timeout > INT_MAX seconds (@eregon).
 
 Compatibility:
 

lib/truffle/io/wait.rb

@@ -17,12 +17,11 @@ def ready?
     Truffle::IOOperations.poll(self, Truffle::IOOperations::POLLIN, 0)
   end
 
-  def wait(timeout = nil)
+  def wait_readable(timeout = nil)
     ensure_open_and_readable
     Truffle::IOOperations.poll(self, Truffle::IOOperations::POLLIN, timeout) ? self : nil
   end
-
-  alias_method :wait_readable, :wait
+  alias_method :wait, :wait_readable
 
   def wait_writable(timeout = nil)
     ensure_open_and_writable

spec/ruby/library/io-wait/wait_readable_spec.rb

@@ -0,0 +1,25 @@
+require_relative '../../spec_helper'
+
+require 'io/wait'
+
+describe "IO#wait_readable" do
+  before :each do
+    @io = File.new(__FILE__ )
+  end
+
+  after :each do
+    @io.close
+  end
+
+  it "waits for the IO to become readable with no timeout" do
+    @io.wait_readable.should == @io
+  end
+
+  it "waits for the IO to become readable with the given timeout" do
+    @io.wait_readable(1).should == @io
+  end
+
+  it "waits for the IO to become readable with the given large timeout" do
+    @io.wait_readable(365 * 24 * 60 * 60).should == @io
+  end
+end

spec/ruby/library/io-wait/wait_writable_spec.rb

@@ -0,0 +1,18 @@
+require_relative '../../spec_helper'
+
+require 'io/wait'
+
+describe "IO#wait_writable" do
+  it "waits for the IO to become writable with no timeout" do
+    STDOUT.wait_writable.should == STDOUT
+  end
+
+  it "waits for the IO to become writable with the given timeout" do
+    STDOUT.wait_writable(1).should == STDOUT
+  end
+
+  it "waits for the IO to become writable with the given large timeout" do
+    # Represents one year and is larger than a 32-bit int
+    STDOUT.wait_writable(365 * 24 * 60 * 60).should == STDOUT
+  end
+end

src/main/ruby/truffleruby/core/truffle/io_operations.rb

@@ -212,9 +212,16 @@ def self.poll(io, event_mask, timeout)
         raise ArgumentError, 'timeout must be positive' if timeout < 0
 
         # Milliseconds, rounded down
-        timeout = remaining_timeout = (timeout * 1_000).to_i
+        timeout_ms = Primitive.rb_to_int((timeout * 1_000).to_i)
+        while timeout_ms > 2147483647 # INT_MAX
+          timeout_ms -= 2147483000
+          ret = poll(io, event_mask, 2147483)
+          return ret unless ret == false
+        end
+
+        remaining_timeout = timeout_ms
         start = Process.clock_gettime(Process::CLOCK_MONOTONIC, :millisecond)
-        deadline = start + timeout
+        deadline = start + timeout_ms
       else
         remaining_timeout = -1
       end
@@ -225,7 +232,7 @@ def self.poll(io, event_mask, timeout)
           if primitive_result < 0
             errno = Errno.errno
             if errno == Errno::EINTR::Errno
-              if timeout
+              if timeout_ms
                 # Update timeout
                 now = Process.clock_gettime(Process::CLOCK_MONOTONIC, :millisecond)
                 if now >= deadline