mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* io.c (rb_io_flush): release GVL during fsync() on Windows.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@33878 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
d81c20771d
commit
02f9b4d606
2 changed files with 16 additions and 9 deletions
|
@ -1,3 +1,7 @@
|
||||||
|
Mon Nov 28 11:46:35 2011 NAKAMURA Usaku <usa@ruby-lang.org>
|
||||||
|
|
||||||
|
* io.c (rb_io_flush): release GVL during fsync() on Windows.
|
||||||
|
|
||||||
Mon Nov 28 11:00:25 2011 NAKAMURA Usaku <usa@ruby-lang.org>
|
Mon Nov 28 11:00:25 2011 NAKAMURA Usaku <usa@ruby-lang.org>
|
||||||
|
|
||||||
* include/ruby/subst.h: typo of r33876.
|
* include/ruby/subst.h: typo of r33876.
|
||||||
|
|
21
io.c
21
io.c
|
@ -1187,6 +1187,15 @@ rb_io_addstr(VALUE io, VALUE str)
|
||||||
return io;
|
return io;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef HAVE_FSYNC
|
||||||
|
static VALUE nogvl_fsync(void *ptr)
|
||||||
|
{
|
||||||
|
rb_io_t *fptr = ptr;
|
||||||
|
|
||||||
|
return (VALUE)fsync(fptr->fd);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* call-seq:
|
* call-seq:
|
||||||
* ios.flush -> ios
|
* ios.flush -> ios
|
||||||
|
@ -1220,7 +1229,7 @@ rb_io_flush(VALUE io)
|
||||||
rb_sys_fail(0);
|
rb_sys_fail(0);
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
if (GetFileType((HANDLE)rb_w32_get_osfhandle(fptr->fd)) == FILE_TYPE_DISK) {
|
if (GetFileType((HANDLE)rb_w32_get_osfhandle(fptr->fd)) == FILE_TYPE_DISK) {
|
||||||
fsync(fptr->fd);
|
rb_thread_io_blocking_region(nogvl_fsync, fptr, fptr->fd);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
@ -1332,6 +1341,8 @@ rb_io_set_pos(VALUE io, VALUE offset)
|
||||||
|
|
||||||
static void clear_readconv(rb_io_t *fptr);
|
static void clear_readconv(rb_io_t *fptr);
|
||||||
|
|
||||||
|
#ifdef HAVE_FSYNC
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* call-seq:
|
* call-seq:
|
||||||
* ios.rewind -> 0
|
* ios.rewind -> 0
|
||||||
|
@ -1508,14 +1519,6 @@ rb_io_set_sync(VALUE io, VALUE sync)
|
||||||
return sync;
|
return sync;
|
||||||
}
|
}
|
||||||
|
|
||||||
#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
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue