1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

use rb_thread_io_blocking_call() more

Browse Source 
use `rb_thread_io_blocking_call()` instead of
`rb_thread_io_blocking_region()` more.

See https://github.com/ruby/ruby/pull/9178#issuecomment-1858711533
This commit is contained in:
Koichi Sasada 2023-12-20 06:15:15 +09:00
parent ec51a3c818
commit 7a0dfdea8c
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
io.c
View File

@ -1286,7 +1286,7 @@ rb_io_read_memory(rb_io_t *fptr, void *buf, size_t count)
iis.timeout = &timeout_storage; iis.timeout = &timeout_storage;
} }
return (ssize_t)rb_thread_io_blocking_region(internal_read_func, &iis, fptr->fd); return (ssize_t)rb_thread_io_blocking_call(internal_read_func, &iis, fptr->fd, RB_WAITFD_IN);
} }
static ssize_t static ssize_t
@ -1319,7 +1319,7 @@ rb_io_write_memory(rb_io_t *fptr, const void *buf, size_t count)
iis.timeout = &timeout_storage; iis.timeout = &timeout_storage;
} }
return (ssize_t)rb_thread_io_blocking_region(internal_write_func, &iis, fptr->fd); return (ssize_t)rb_thread_io_blocking_call(internal_write_func, &iis, fptr->fd, RB_WAITFD_OUT);
} }
#ifdef HAVE_WRITEV #ifdef HAVE_WRITEV
@ -1356,7 +1356,7 @@ rb_writev_internal(rb_io_t *fptr, const struct iovec *iov, int iovcnt)
iis.timeout = &timeout_storage; iis.timeout = &timeout_storage;
} }
return (ssize_t)rb_thread_io_blocking_region(internal_writev_func, &iis, fptr->fd); return (ssize_t)rb_thread_io_blocking_call(internal_writev_func, &iis, fptr->fd, RB_WAITFD_OUT);
} }
#endif #endif
@ -1386,7 +1386,7 @@ static VALUE
io_flush_buffer_async(VALUE arg) io_flush_buffer_async(VALUE arg)
{ {
rb_io_t *fptr = (rb_io_t *)arg; rb_io_t *fptr = (rb_io_t *)arg;
return rb_thread_io_blocking_region(io_flush_buffer_sync, fptr, fptr->fd); return rb_thread_io_blocking_call(io_flush_buffer_sync, fptr, fptr->fd, RB_WAITFD_OUT);
} }
static inline int static inline int
@ -3410,7 +3410,7 @@ io_read_memory_call(VALUE arg)
} }
} }
return rb_thread_io_blocking_region(internal_read_func, iis, iis->fptr->fd); return rb_thread_io_blocking_call(internal_read_func, iis, iis->fptr->fd, RB_WAITFD_IN);
} }
static long static long
@ -6115,7 +6115,7 @@ pread_internal_call(VALUE _arg)
} }
} }
return rb_thread_io_blocking_region(internal_pread_func, arg, arg->fd); return rb_thread_io_blocking_call(internal_pread_func, arg, arg->fd, RB_WAITFD_IN);
} }
/* /*
@ -6248,7 +6248,7 @@ rb_io_pwrite(VALUE io, VALUE str, VALUE offset)
arg.buf = RSTRING_PTR(tmp); arg.buf = RSTRING_PTR(tmp);
arg.count = (size_t)RSTRING_LEN(tmp); arg.count = (size_t)RSTRING_LEN(tmp);
n = (ssize_t)rb_thread_io_blocking_region(internal_pwrite_func, &arg, fptr->fd); n = (ssize_t)rb_thread_io_blocking_call(internal_pwrite_func, &arg, fptr->fd, RB_WAITFD_OUT);
if (n < 0) rb_sys_fail_path(fptr->pathv); if (n < 0) rb_sys_fail_path(fptr->pathv);
rb_str_tmp_frozen_release(str, tmp); rb_str_tmp_frozen_release(str, tmp);