From 50024f9da6280c9fe48a4886364bae62d4eef92e Mon Sep 17 00:00:00 2001 From: kosaki Date: Sat, 17 Oct 2015 23:31:23 +0000 Subject: [PATCH] * io.c (fptr_finalize): don't release gvl if fptr is not writable. writable fd may block on close(2) when it's on NFS. But readonly fd doesn't. [Bug #11559] result: make benchmark OPTS="-p bm_require_t -e ruby-trunk -e ruby-2.2.2" build-ruby: 0.171 ruby 2.3.0dev(r52151): 0.659 ruby 2.2.0p95 (r50295): 0.834 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52152 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 10 ++++++++++ io.c | 7 ++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 9385aa9457..c3e260d8c4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +Sun Oct 18 08:26:51 2015 KOSAKI Motohiro + + * io.c (fptr_finalize): don't release gvl if fptr is not writable. + writable fd may block on close(2) when it's on NFS. But readonly + fd doesn't. [Bug #11559] + result: make benchmark OPTS="-p bm_require_t -e ruby-trunk -e ruby-2.2.2" + build-ruby: 0.171 + ruby 2.3.0dev(r52151): 0.659 + ruby 2.2.0p95 (r50295): 0.834 + Sun Oct 18 05:11:22 2015 KOSAKI Motohiro * ruby.c (open_load_file): reset O_NONBLOCK after open. diff --git a/io.c b/io.c index b7e3316e3f..682f733b95 100644 --- a/io.c +++ b/io.c @@ -4263,6 +4263,7 @@ fptr_finalize(rb_io_t *fptr, int noraise) VALUE err = Qnil; int fd = fptr->fd; FILE *stdio_file = fptr->stdio_file; + int mode = fptr->mode; if (fptr->writeconv) { if (fptr->write_lock && !noraise) { @@ -4303,7 +4304,11 @@ fptr_finalize(rb_io_t *fptr, int noraise) /* fptr->fd may be closed even if close fails. * POSIX doesn't specify it. * We assumes it is closed. */ - if ((maygvl_close(fd, noraise) < 0) && NIL_P(err)) + + /**/ + int keepgvl = !(mode & FMODE_WRITABLE); + keepgvl |= noraise; + if ((maygvl_close(fd, keepgvl) < 0) && NIL_P(err)) err = noraise ? Qtrue : INT2NUM(errno); }