mirror of
https://github.com/ruby/ruby.git
synced 2025-08-23 13:04:13 +02:00
* io.c: fix IO.copy_stream interrupt handling.
based on the patch by Eric Wong. [ruby-core:36156] * vm_core.h (rb_thread_call_with_gvl): don't declare here. * thread.c: include internal.h. (rb_thread_execute_interrupts): new function. * internal.h (rb_thread_execute_interrupts): declared. (rb_thread_call_with_gvl): declared. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31971 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr
parent
1fdbe0f437
commit
87f025da25
6 changed files with 137 additions and 23 deletions
104
io.c
104
io.c
|
|
@ -14,6 +14,7 @@
|
|||
#include "ruby/ruby.h"
|
||||
#include "ruby/io.h"
|
||||
#include "dln.h"
|
||||
#include "internal.h"
|
||||
#include <ctype.h>
|
||||
#include <errno.h>
|
||||
|
||||
|
|
@ -8517,13 +8518,57 @@ struct copy_stream_struct {
|
|||
VALUE th;
|
||||
};
|
||||
|
||||
static void *
|
||||
exec_interrupts(void *arg)
|
||||
{
|
||||
VALUE th = (VALUE)arg;
|
||||
rb_thread_execute_interrupts(th);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/*
|
||||
* returns TRUE if the preceding system call was interrupted
|
||||
* so we can continue. If the thread was interrupted, we
|
||||
* reacquire the GVL to execute interrupts before continuing.
|
||||
*/
|
||||
static int
|
||||
maygvl_copy_stream_wait_read(struct copy_stream_struct *stp)
|
||||
maygvl_copy_stream_continue_p(int has_gvl, struct copy_stream_struct *stp)
|
||||
{
|
||||
switch (errno) {
|
||||
case EINTR:
|
||||
#if defined(ERESTART)
|
||||
case ERESTART:
|
||||
#endif
|
||||
if (rb_thread_interrupted(stp->th))
|
||||
if (has_gvl)
|
||||
rb_thread_execute_interrupts(stp->th);
|
||||
else
|
||||
rb_thread_call_with_gvl(exec_interrupts, (void *)stp->th);
|
||||
return TRUE;
|
||||
}
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
static int
|
||||
maygvl_select(int has_gvl, int n, rb_fdset_t *rfds, rb_fdset_t *wfds, rb_fdset_t *efds, struct timeval *timeout)
|
||||
{
|
||||
if (has_gvl)
|
||||
return rb_thread_fd_select(n, rfds, wfds, efds, timeout);
|
||||
else
|
||||
return rb_fd_select(n, rfds, wfds, efds, timeout);
|
||||
}
|
||||
|
||||
static int
|
||||
maygvl_copy_stream_wait_read(int has_gvl, struct copy_stream_struct *stp)
|
||||
{
|
||||
int ret;
|
||||
rb_fd_zero(&stp->fds);
|
||||
rb_fd_set(stp->src_fd, &stp->fds);
|
||||
ret = rb_fd_select(rb_fd_max(&stp->fds), &stp->fds, NULL, NULL, NULL);
|
||||
|
||||
do {
|
||||
rb_fd_zero(&stp->fds);
|
||||
rb_fd_set(stp->src_fd, &stp->fds);
|
||||
ret = maygvl_select(has_gvl, rb_fd_max(&stp->fds), &stp->fds, NULL, NULL, NULL);
|
||||
} while (ret == -1 && maygvl_copy_stream_continue_p(has_gvl, stp));
|
||||
|
||||
if (ret == -1) {
|
||||
stp->syserr = "select";
|
||||
stp->error_no = errno;
|
||||
|
|
@ -8536,9 +8581,13 @@ static int
|
|||
nogvl_copy_stream_wait_write(struct copy_stream_struct *stp)
|
||||
{
|
||||
int ret;
|
||||
rb_fd_zero(&stp->fds);
|
||||
rb_fd_set(stp->dst_fd, &stp->fds);
|
||||
ret = rb_fd_select(rb_fd_max(&stp->fds), NULL, &stp->fds, NULL, NULL);
|
||||
|
||||
do {
|
||||
rb_fd_zero(&stp->fds);
|
||||
rb_fd_set(stp->dst_fd, &stp->fds);
|
||||
ret = rb_fd_select(rb_fd_max(&stp->fds), NULL, &stp->fds, NULL, NULL);
|
||||
} while (ret == -1 && maygvl_copy_stream_continue_p(0, stp));
|
||||
|
||||
if (ret == -1) {
|
||||
stp->syserr = "select";
|
||||
stp->error_no = errno;
|
||||
|
|
@ -8600,13 +8649,13 @@ simple_sendfile(int out_fd, int in_fd, off_t *offset, off_t count)
|
|||
|
||||
#ifdef USE_SENDFILE
|
||||
static int
|
||||
maygvl_copy_stream_wait_readwrite(struct copy_stream_struct *stp)
|
||||
maygvl_copy_stream_wait_readwrite(int has_gvl, struct copy_stream_struct *stp)
|
||||
{
|
||||
int ret;
|
||||
rb_fd_zero(&stp->fds);
|
||||
rb_fd_set(stp->src_fd, &stp->fds);
|
||||
rb_fd_set(stp->dst_fd, &stp->fds);
|
||||
ret = rb_fd_select(rb_fd_max(&stp->fds), &stp->fds, NULL, NULL, NULL);
|
||||
ret = maygvl_select(has_gvl, rb_fd_max(&stp->fds), &stp->fds, NULL, NULL, NULL);
|
||||
if (ret == -1) {
|
||||
stp->syserr = "select";
|
||||
stp->error_no = errno;
|
||||
|
|
@ -8685,6 +8734,8 @@ nogvl_copy_stream_sendfile(struct copy_stream_struct *stp)
|
|||
}
|
||||
}
|
||||
if (ss == -1) {
|
||||
if (maygvl_copy_stream_continue_p(0, stp))
|
||||
goto retry_sendfile;
|
||||
switch (errno) {
|
||||
case EINVAL:
|
||||
#ifdef ENOSYS
|
||||
|
|
@ -8695,9 +8746,7 @@ nogvl_copy_stream_sendfile(struct copy_stream_struct *stp)
|
|||
#if defined(EWOULDBLOCK) && EWOULDBLOCK != EAGAIN
|
||||
case EWOULDBLOCK:
|
||||
#endif
|
||||
if (maygvl_copy_stream_wait_readwrite(stp) == -1)
|
||||
return -1;
|
||||
if (rb_thread_interrupted(stp->th))
|
||||
if (maygvl_copy_stream_wait_readwrite(0, stp) == -1)
|
||||
return -1;
|
||||
goto retry_sendfile;
|
||||
}
|
||||
|
|
@ -8710,12 +8759,22 @@ nogvl_copy_stream_sendfile(struct copy_stream_struct *stp)
|
|||
#endif
|
||||
|
||||
static ssize_t
|
||||
maygvl_copy_stream_read(struct copy_stream_struct *stp, char *buf, size_t len, off_t offset)
|
||||
maygvl_read(int has_gvl, int fd, void *buf, size_t count)
|
||||
{
|
||||
if (has_gvl)
|
||||
return rb_read_internal(fd, buf, count);
|
||||
else
|
||||
return read(fd, buf, count);
|
||||
}
|
||||
|
||||
static ssize_t
|
||||
maygvl_copy_stream_read(int has_gvl, struct copy_stream_struct *stp, char *buf, size_t len, off_t offset)
|
||||
{
|
||||
ssize_t ss;
|
||||
retry_read:
|
||||
if (offset == (off_t)-1)
|
||||
ss = read(stp->src_fd, buf, len);
|
||||
if (offset == (off_t)-1) {
|
||||
ss = maygvl_read(has_gvl, stp->src_fd, buf, len);
|
||||
}
|
||||
else {
|
||||
#ifdef HAVE_PREAD
|
||||
ss = pread(stp->src_fd, buf, len, offset);
|
||||
|
|
@ -8728,12 +8787,14 @@ maygvl_copy_stream_read(struct copy_stream_struct *stp, char *buf, size_t len, o
|
|||
return 0;
|
||||
}
|
||||
if (ss == -1) {
|
||||
if (maygvl_copy_stream_continue_p(has_gvl, stp))
|
||||
goto retry_read;
|
||||
switch (errno) {
|
||||
case EAGAIN:
|
||||
#if defined(EWOULDBLOCK) && EWOULDBLOCK != EAGAIN
|
||||
case EWOULDBLOCK:
|
||||
#endif
|
||||
if (maygvl_copy_stream_wait_read(stp) == -1)
|
||||
if (maygvl_copy_stream_wait_read(has_gvl, stp) == -1)
|
||||
return -1;
|
||||
goto retry_read;
|
||||
#ifdef ENOSYS
|
||||
|
|
@ -8757,6 +8818,8 @@ nogvl_copy_stream_write(struct copy_stream_struct *stp, char *buf, size_t len)
|
|||
while (len) {
|
||||
ss = write(stp->dst_fd, buf+off, len);
|
||||
if (ss == -1) {
|
||||
if (maygvl_copy_stream_continue_p(0, stp))
|
||||
continue;
|
||||
if (errno == EAGAIN || errno == EWOULDBLOCK) {
|
||||
if (nogvl_copy_stream_wait_write(stp) == -1)
|
||||
return -1;
|
||||
|
|
@ -8811,12 +8874,12 @@ nogvl_copy_stream_read_write(struct copy_stream_struct *stp)
|
|||
len = sizeof(buf);
|
||||
}
|
||||
if (use_pread) {
|
||||
ss = maygvl_copy_stream_read(stp, buf, len, src_offset);
|
||||
ss = maygvl_copy_stream_read(0, stp, buf, len, src_offset);
|
||||
if (0 < ss)
|
||||
src_offset += ss;
|
||||
}
|
||||
else {
|
||||
ss = maygvl_copy_stream_read(stp, buf, len, (off_t)-1);
|
||||
ss = maygvl_copy_stream_read(0, stp, buf, len, (off_t)-1);
|
||||
}
|
||||
if (ss <= 0) /* EOF or error */
|
||||
return;
|
||||
|
|
@ -8827,9 +8890,6 @@ nogvl_copy_stream_read_write(struct copy_stream_struct *stp)
|
|||
|
||||
if (!use_eof)
|
||||
copy_length -= ss;
|
||||
|
||||
if (rb_thread_interrupted(stp->th))
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -8890,7 +8950,7 @@ copy_stream_fallback_body(VALUE arg)
|
|||
ssize_t ss;
|
||||
rb_thread_wait_fd(stp->src_fd);
|
||||
rb_str_resize(buf, buflen);
|
||||
ss = maygvl_copy_stream_read(stp, RSTRING_PTR(buf), l, off);
|
||||
ss = maygvl_copy_stream_read(1, stp, RSTRING_PTR(buf), l, off);
|
||||
if (ss == -1)
|
||||
return Qnil;
|
||||
if (ss == 0)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue