kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

merge revision(s) r33826:

Browse source 
* 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]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34451 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
kosaki 2012-02-06 20:19:29 +00:00
parent 4b295bb7ca
commit ea0ef6af83
3 changed files with 24 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
Mon Feb 6 15:19:17 2012 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]
Mon Feb 6 15:01:55 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> Mon Feb 6 15:01:55 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
* vm_eval.c (vm_call0): should pass block to enumerators. patched * vm_eval.c (vm_call0): should pass block to enumerators. patched

18
io.c
View file

@ -1358,6 +1358,13 @@ rb_io_set_sync(VALUE io, VALUE sync)
} }
#ifdef HAVE_FSYNC #ifdef HAVE_FSYNC
static VALUE nogvl_fsync(void *ptr)
{
rb_io_t *fptr = ptr;
return (VALUE)fsync(fptr->fd);
}
/* /*
* call-seq: * call-seq:
* ios.fsync -> 0 or nil * ios.fsync -> 0 or nil
@ -1383,7 +1390,7 @@ rb_io_fsync(VALUE io)
if (io_fflush(fptr) < 0) if (io_fflush(fptr) < 0)
rb_sys_fail(0); rb_sys_fail(0);
#ifndef _WIN32 /* already called in io_fflush() */ #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); rb_sys_fail_path(fptr->pathv);
#endif #endif
return INT2FIX(0); return INT2FIX(0);
@ -1393,6 +1400,13 @@ rb_io_fsync(VALUE io)
#endif #endif
#ifdef HAVE_FDATASYNC #ifdef HAVE_FDATASYNC
static VALUE nogvl_fdatasync(void *ptr)
{
rb_io_t *fptr = ptr;
return (VALUE)fdatasync(fptr->fd);
}
/* /*
* call-seq: * call-seq:
* ios.fdatasync -> 0 or nil * ios.fdatasync -> 0 or nil
@ -1415,7 +1429,7 @@ rb_io_fdatasync(VALUE io)
if (io_fflush(fptr) < 0) if (io_fflush(fptr) < 0)
rb_sys_fail(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); return INT2FIX(0);
/* fall back */ /* fall back */

2
version.h
View file

@ -1,5 +1,5 @@
#define RUBY_VERSION "1.9.3" #define RUBY_VERSION "1.9.3"
#define RUBY_PATCHLEVEL 44 #define RUBY_PATCHLEVEL 45
#define RUBY_RELEASE_DATE "2012-02-07" #define RUBY_RELEASE_DATE "2012-02-07"
#define RUBY_RELEASE_YEAR 2012 #define RUBY_RELEASE_YEAR 2012