Project

General

Profile

Feature #4646 ยป 0001-io-wait-add-IO-wait_writable-method.patch

normalperson (Eric Wong), 05/05/2011 07:25 AM

View differences:

ext/io/wait/wait.c
}
/*
* call-seq:
* io.wait_writable -> IO
* io.wait_writable(timeout) -> IO or nil
*
* Waits until IO writable is available or times out and returns self or
* nil when EOF is reached.
*/
static VALUE
io_wait_writable(int argc, VALUE *argv, VALUE io)
{
rb_io_t *fptr;
int i;
VALUE timeout;
struct timeval timerec;
struct timeval *tv;
GetOpenFile(io, fptr);
rb_io_check_writable(fptr);
rb_scan_args(argc, argv, "01", &timeout);
if (NIL_P(timeout)) {
tv = NULL;
}
else {
timerec = rb_time_interval(timeout);
tv = &timerec;
}
i = rb_wait_for_single_fd(fptr->fd, RB_WAITFD_OUT, tv);
if (i < 0)
rb_sys_fail(0);
rb_io_check_closed(fptr);
if (i & RB_WAITFD_OUT)
return io;
return Qnil;
}
/*
* IO wait methods
*/
......
rb_define_method(rb_cIO, "nread", io_nread, 0);
rb_define_method(rb_cIO, "ready?", io_ready_p, 0);
rb_define_method(rb_cIO, "wait", io_wait, -1);
rb_define_method(rb_cIO, "wait_writable", io_wait_writable, -1);
}
test/io/wait/test_io_wait.rb
Thread.new { sleep 0.01; @w.close }
assert_nil @r.wait
end
def test_wait_writable
assert_equal @w, @w.wait_writable
end
def test_wait_writable_timeout
assert_equal @w, @w.wait_writable(0.001)
written = fill_pipe
assert_nil @w.wait_writable(0.001)
@r.read(written)
assert_equal @w, @w.wait_writable(0.001)
end
def test_wait_writable_EPIPE
fill_pipe
@r.close
assert_equal @w, @w.wait_writable
end
def test_wait_writable_closed
@w.close
assert_raises(IOError) { @w.wait_writable }
end
def test_wait_writable_closed_while_waiting
thr = Thread.new do
begin
@w.wait_writable
rescue => err
err
end
end
Thread.pass until thr.stop?
@w.close
assert_instance_of IOError, thr.value
end
private
def fill_pipe
written = 0
buf = " " * 4096
begin
written += @w.write_nonblock(buf)
rescue Errno::EAGAIN
return written
end while true
end
end if IO.method_defined?(:wait)
    (1-1/1)