nobu	2011-02-20 16:22:57 +0900 (Sun, 20 Feb 2011)

  New Revision: 30921

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=30921

  Log:
    * file.c (rb_file_flock): use rb_thread_io_blocking_region for the
      time being.

  Modified files:
    trunk/ChangeLog
    trunk/file.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 30920)
+++ ChangeLog	(revision 30921)
@@ -1,3 +1,8 @@
+Sun Feb 20 16:22:53 2011  Nobuyoshi Nakada  <nobu@r...>
+
+	* file.c (rb_file_flock): use rb_thread_io_blocking_region for the
+	  time being.
+
 Sun Feb 20 05:33:17 2011  Ryan Davis  <ryand-ruby@z...>
 
 	* lib/minitest/*.rb: Imported minitest 2.0.2 r6207.
Index: file.c
===================================================================
--- file.c	(revision 30920)
+++ file.c	(revision 30921)
@@ -4058,7 +4058,7 @@
     if (fptr->mode & FMODE_WRITABLE) {
 	rb_io_flush(obj);
     }
-    while ((int)rb_thread_blocking_region(rb_thread_flock, op, RUBY_UBF_IO, 0) < 0) {
+    while ((int)rb_thread_io_blocking_region(rb_thread_flock, op, fptr->fd) < 0) {
 	switch (errno) {
 	  case EAGAIN:
 	  case EACCES:

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/