Project

General

Profile

Feature #4570 ยป 0001-io.c-rb_io_close-release-GVL-if-possible.patch

normalperson (Eric Wong), 04/12/2011 01:51 AM

View differences:

io.c
return finish_writeconv(p->fptr, p->noalloc);
}
static VALUE
nogvl_close(void *ptr)
{
int *fd = ptr;
return (VALUE)close(*fd);
}
static int
maygvl_close(int fd, int keepgvl)
{
if (keepgvl)
return close(fd);
/*
* close() may block for certain file types (NFS, SO_LINGER sockets,
* inotify), so let other threads run.
*/
return (int)rb_thread_blocking_region(nogvl_close, &fd, RUBY_UBF_IO, 0);
}
static VALUE
nogvl_fclose(void *ptr)
{
FILE *file = ptr;
return (VALUE)fclose(file);
}
static int
maygvl_fclose(FILE *file, int keepgvl)
{
if (keepgvl)
return fclose(file);
return (int)rb_thread_blocking_region(nogvl_fclose, file, RUBY_UBF_IO, 0);
}
static void
fptr_finalize(rb_io_t *fptr, int noraise)
{
VALUE err = Qnil;
int fd = fptr->fd;
FILE *stdio_file = fptr->stdio_file;
if (fptr->writeconv) {
if (fptr->write_lock && !noraise) {
struct finish_writeconv_arg arg;
......
err = INT2NUM(errno);
}
}
if (IS_PREP_STDIO(fptr) || fptr->fd <= 2) {
goto skip_fd_close;
fptr->fd = -1;
fptr->stdio_file = 0;
if (!noraise)
rb_thread_fd_close(fd);
if (IS_PREP_STDIO(fptr) || fd <= 2) {
/* need to keep FILE objects of stdin, stdout and stderr */
}
if (fptr->stdio_file) {
/* fptr->stdio_file is deallocated anyway
else if (stdio_file) {
/* stdio_file is deallocated anyway
* even if fclose failed. */
if (fclose(fptr->stdio_file) < 0 && NIL_P(err))
if ((maygvl_fclose(stdio_file, noraise) < 0) && NIL_P(err))
err = noraise ? Qtrue : INT2NUM(errno);
}
else if (0 <= fptr->fd) {
else if (0 <= fd) {
/* fptr->fd may be closed even if close fails.
* POSIX doesn't specify it.
* We assumes it is closed. */
if (close(fptr->fd) < 0 && NIL_P(err))
if ((maygvl_close(fd, noraise) < 0) && NIL_P(err))
err = noraise ? Qtrue : INT2NUM(errno);
}
skip_fd_close:
fptr->fd = -1;
fptr->stdio_file = 0;
fptr->mode &= ~(FMODE_READABLE|FMODE_WRITABLE);
if (!NIL_P(err) && !noraise) {
......
rb_io_close(VALUE io)
{
rb_io_t *fptr;
int fd;
VALUE write_io;
rb_io_t *write_fptr;
......
if (!fptr) return Qnil;
if (fptr->fd < 0) return Qnil;
fd = fptr->fd;
rb_io_fptr_cleanup(fptr, FALSE);
rb_thread_fd_close(fd);
if (fptr->pid) {
rb_syswait(fptr->pid);
......
rb_sys_fail_path(orig->pathv);
}
else {
fclose(fptr->stdio_file);
maygvl_fclose(fptr->stdio_file, 0);
fptr->stdio_file = 0;
fptr->fd = -1;
if (dup2(fd2, fd) < 0)
    (1-1/1)