kosaki	2012-09-09 18:10:46 +0900 (Sun, 09 Sep 2012)

  New Revision: 36932

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

  Log:
    * io.c (nogvl_close, maygvl_close, nogvl_fclose, maygvl_fclose):
      new functions.
    * io.c (fptr_finalize): release GVL if possible.
      Patched by Eric Wong. [Feature #4570] [ruby-core:35711]

  Modified files:
    trunk/ChangeLog
    trunk/io.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 36931)
+++ ChangeLog	(revision 36932)
@@ -1,3 +1,10 @@
+Sun Sep  9 16:47:12 2012  KOSAKI Motohiro  <kosaki.motohiro@g...>
+
+	* io.c (nogvl_close, maygvl_close, nogvl_fclose, maygvl_fclose):
+	  new functions.
+	* io.c (fptr_finalize): release GVL if possible.
+	  Patched by Eric Wong. [Feature #4570] [ruby-core:35711]
+
 Sun Sep  9 16:08:48 2012  KOSAKI Motohiro  <kosaki.motohiro@g...>
 
 	* io.c (io_bufread): removed unnecessary rb_thread_wait_fd().
Index: io.c
===================================================================
--- io.c	(revision 36931)
+++ io.c	(revision 36932)
@@ -3853,10 +3853,51 @@
     return finish_writeconv(p->fptr, p->noalloc);
 }
 
+static void*
+nogvl_close(void *ptr)
+{
+    int *fd = ptr;
+
+    return (void*)close(*fd);
+}
+
+static int
+maygvl_close(int fd, int keepgvl)
+{
+    if (keepgvl)
+	return close(fd);
+
+    /*
+     * close() may block for certain file types (NFS, SO_LINGER sockets,
+     * inotify), so let other threads run.
+     */
+    return (int)rb_thread_call_without_gvl(nogvl_close, &fd, RUBY_UBF_IO, 0);
+}
+
+static void*
+nogvl_fclose(void *ptr)
+{
+    FILE *file = ptr;
+
+    return (void*)fclose(file);
+}
+
+static int
+maygvl_fclose(FILE *file, int keepgvl)
+{
+    if (keepgvl)
+	return fclose(file);
+
+    return (int)rb_thread_call_without_gvl(nogvl_fclose, file, RUBY_UBF_IO, 0);
+}
+
 static void
 fptr_finalize(rb_io_t *fptr, int noraise)
 {
     VALUE err = Qnil;
+    int fd = fptr->fd;
+    FILE *stdio_file = fptr->stdio_file;
+
     if (fptr->writeconv) {
 	if (fptr->write_lock && !noraise) {
             struct finish_writeconv_arg arg;
@@ -3878,25 +3919,27 @@
 		err = INT2NUM(errno);
 	}
     }
-    if (IS_PREP_STDIO(fptr) || fptr->fd <= 2) {
-        goto skip_fd_close;
+
+    fptr->fd = -1;
+    fptr->stdio_file = 0;
+    if (!noraise)
+	rb_thread_fd_close(fd);
+    if (IS_PREP_STDIO(fptr) || fd <= 2) {
+	/* need to keep FILE objects of stdin, stdout and stderr */
     }
-    if (fptr->stdio_file) {
-        /* fptr->stdio_file is deallocated anyway
+    else if (stdio_file) {
+	/* stdio_file is deallocated anyway
          * even if fclose failed.  */
-        if (fclose(fptr->stdio_file) < 0 && NIL_P(err))
-            err = noraise ? Qtrue : INT2NUM(errno);
+	if ((maygvl_fclose(stdio_file, noraise) < 0) && NIL_P(err))
+	    err = noraise ? Qtrue : INT2NUM(errno);
     }
-    else if (0 <= fptr->fd) {
-        /* fptr->fd may be closed even if close fails.
+    else if (0 <= fd) {
+	/* fptr->fd may be closed even if close fails.
          * POSIX doesn't specify it.
          * We assumes it is closed.  */
-        if (close(fptr->fd) < 0 && NIL_P(err))
-            err = noraise ? Qtrue : INT2NUM(errno);
+	if ((maygvl_close(fd, noraise) < 0) && NIL_P(err))
+	    err = noraise ? Qtrue : INT2NUM(errno);
     }
-  skip_fd_close:
-    fptr->fd = -1;
-    fptr->stdio_file = 0;
     fptr->mode &= ~(FMODE_READABLE|FMODE_WRITABLE);
 
     if (!NIL_P(err) && !noraise) {

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