kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

Improvements to rb_io_wait return value handling and internal implementation. (#5340)

Browse source
This commit is contained in:
Samuel Williams 2021-12-24 23:11:02 +13:00 • committed by GitHub
parent 4fccefef05
commit acfe2f2655
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
Notes: git 2021-12-24 19:11:36 +09:00 
Merged-By: ioquatix <samuel@codeotaku.com>
2 changed files with 20 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/ruby/fiber/scheduler.h
View file

@ -205,7 +205,7 @@ VALUE rb_fiber_scheduler_unblock(VALUE scheduler, VALUE blocker, VALUE fiber);
* this for instance switches to another fiber etc. * this for instance switches to another fiber etc.
* *
* The "events" here is a Ruby level integer, which is an OR-ed value of * The "events" here is a Ruby level integer, which is an OR-ed value of
* `IO::READABLE`, `IO::WRITable`, and `IO::PRIORITY`. * `IO::READABLE`, `IO::WRITABLE`, and `IO::PRIORITY`.
* *
* @param[in] scheduler Target scheduler. * @param[in] scheduler Target scheduler.
* @param[in] io An io object to wait. * @param[in] io An io object to wait.

23
io.c
View file

@ -500,7 +500,7 @@ rb_cloexec_fcntl_dupfd(int fd, int minfd)
#if defined(_WIN32) #if defined(_WIN32)
#define WAIT_FD_IN_WIN32(fptr) \ #define WAIT_FD_IN_WIN32(fptr) \
(rb_w32_io_cancelable_p((fptr)->fd) ? 0 : RB_NUM2INT(rb_io_wait(fptr->self, RB_INT2NUM(RUBY_IO_READABLE), Qnil))) (rb_w32_io_cancelable_p((fptr)->fd) ? Qnil : rb_io_wait(fptr->self, RB_INT2NUM(RUBY_IO_READABLE), Qnil))
#else #else
#define WAIT_FD_IN_WIN32(fptr) #define WAIT_FD_IN_WIN32(fptr)
#endif #endif
@ -1323,10 +1323,9 @@ rb_io_wait(VALUE io, VALUE events, VALUE timeout)
// Not sure if this is necessary: // Not sure if this is necessary:
rb_io_check_closed(fptr); rb_io_check_closed(fptr);
if (ready > 0) { if (ready) {
return RB_INT2NUM(ready); return RB_INT2NUM(ready);
} } else {
else {
return Qfalse; return Qfalse;
} }
} }
@ -1490,13 +1489,25 @@ rb_io_maybe_wait(int error, VALUE io, VALUE events, VALUE timeout)
int int
rb_io_maybe_wait_readable(int error, VALUE io, VALUE timeout) rb_io_maybe_wait_readable(int error, VALUE io, VALUE timeout)
{ {
return RB_NUM2INT(rb_io_maybe_wait(error, io, RB_INT2NUM(RUBY_IO_READABLE), timeout)); VALUE result = rb_io_maybe_wait(error, io, RB_INT2NUM(RUBY_IO_READABLE), timeout);
if (RTEST(result)) {
return RB_NUM2INT(result);
} else {
return 0;
}
} }
int int
rb_io_maybe_wait_writable(int error, VALUE io, VALUE timeout) rb_io_maybe_wait_writable(int error, VALUE io, VALUE timeout)
{ {
return RB_NUM2INT(rb_io_maybe_wait(error, io, RB_INT2NUM(RUBY_IO_WRITABLE), timeout)); VALUE result = rb_io_maybe_wait(error, io, RB_INT2NUM(RUBY_IO_WRITABLE), timeout);
if (RTEST(result)) {
return RB_NUM2INT(result);
} else {
return 0;
}
} }
static void static void