diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | io.c | 18 |
2 files changed, 23 insertions, 2 deletions
@@ -1,3 +1,10 @@ +Thu Nov 24 11:12:48 2011 KOSAKI Motohiro <kosaki.motohiro@gmail.com> + + * io.c (rb_io_fsync,rb_io_fdatasync): release GVL during fsync(). + fsync() and fdatasync() may take a long time on slow disks and/or + if there is much dirty data. + Patch by Eric Wong. [Feature #5665] [ruby-core:41247] + Thu Nov 24 10:05:02 2011 Martin Bosslet <Martin.Bosslet@googlemail.com> * test/openssl/test_engine.rb: Suppress output from 'openssl' @@ -1509,6 +1509,13 @@ rb_io_set_sync(VALUE io, VALUE sync) } #ifdef HAVE_FSYNC +static VALUE nogvl_fsync(void *ptr) +{ + rb_io_t *fptr = ptr; + + return (VALUE)fsync(fptr->fd); +} + /* * call-seq: * ios.fsync -> 0 or nil @@ -1534,7 +1541,7 @@ rb_io_fsync(VALUE io) if (io_fflush(fptr) < 0) rb_sys_fail(0); #ifndef _WIN32 /* already called in io_fflush() */ - if (fsync(fptr->fd) < 0) + if ((int)rb_thread_io_blocking_region(nogvl_fsync, fptr, fptr->fd) < 0) rb_sys_fail_path(fptr->pathv); #endif return INT2FIX(0); @@ -1544,6 +1551,13 @@ rb_io_fsync(VALUE io) #endif #ifdef HAVE_FDATASYNC +static VALUE nogvl_fdatasync(void *ptr) +{ + rb_io_t *fptr = ptr; + + return (VALUE)fdatasync(fptr->fd); +} + /* * call-seq: * ios.fdatasync -> 0 or nil @@ -1566,7 +1580,7 @@ rb_io_fdatasync(VALUE io) if (io_fflush(fptr) < 0) rb_sys_fail(0); - if (fdatasync(fptr->fd) == 0) + if ((int)rb_thread_io_blocking_region(nogvl_fdatasync, fptr, fptr->fd) == 0) return INT2FIX(0); /* fall back */ |