naruse	2017-03-12 03:07:19 +0900 (Sun, 12 Mar 2017)

  New Revision: 57872

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=57872

  Log:
    merge revision(s) 57422: [Backport #13158]
    
    io.c: close before wait
    
    * io.c (io_close_fptr): notify then close, and wait for other
      threads before free fptr.  [ruby-core:79262] [Bug #13158]

  Modified directories:
    branches/ruby_2_4/
  Modified files:
    branches/ruby_2_4/io.c
    branches/ruby_2_4/test/ruby/test_io.rb
    branches/ruby_2_4/thread.c
    branches/ruby_2_4/version.h
Index: ruby_2_4/version.h
===================================================================
--- ruby_2_4/version.h	(revision 57871)
+++ ruby_2_4/version.h	(revision 57872)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_4/version.h#L1
 #define RUBY_VERSION "2.4.0"
 #define RUBY_RELEASE_DATE "2017-03-12"
-#define RUBY_PATCHLEVEL 37
+#define RUBY_PATCHLEVEL 38
 
 #define RUBY_RELEASE_YEAR 2017
 #define RUBY_RELEASE_MONTH 3
Index: ruby_2_4/test/ruby/test_io.rb
===================================================================
--- ruby_2_4/test/ruby/test_io.rb	(revision 57871)
+++ ruby_2_4/test/ruby/test_io.rb	(revision 57872)
@@ -3396,6 +3396,27 @@ __END__ https://github.com/ruby/ruby/blob/trunk/ruby_2_4/test/ruby/test_io.rb#L3396
     end;
   end
 
+  def test_race_closed_stream
+    bug13158 = '[ruby-core:79262] [Bug #13158]'
+    closed = nil
+    IO.pipe do |r, w|
+      thread = Thread.new do
+        begin
+          while r.gets
+          end
+        ensure
+          closed = r.closed?
+        end
+      end
+      sleep 0.01
+      r.close
+      assert_raise_with_message(IOError, /stream closed/) do
+        thread.join
+      end
+      assert_equal(true, closed, "#{bug13158}: stream should be closed")
+    end
+  end
+
   if RUBY_ENGINE == "ruby" # implementation details
     def test_foreach_rs_conversion
       make_tempfile {|t|
Index: ruby_2_4/thread.c
===================================================================
--- ruby_2_4/thread.c	(revision 57871)
+++ ruby_2_4/thread.c	(revision 57872)
@@ -2159,14 +2159,13 @@ rb_threadptr_reset_raised(rb_thread_t *t https://github.com/ruby/ruby/blob/trunk/ruby_2_4/thread.c#L2159
     return 1;
 }
 
-void
-rb_thread_fd_close(int fd)
+int
+rb_notify_fd_close(int fd)
 {
     rb_vm_t *vm = GET_THREAD()->vm;
     rb_thread_t *th = 0;
     int busy;
 
-  retry:
     busy = 0;
     list_for_each(&vm->living_threads, th, vmlt_node) {
 	if (th->waiting_fd == fd) {
@@ -2176,10 +2175,7 @@ rb_thread_fd_close(int fd) https://github.com/ruby/ruby/blob/trunk/ruby_2_4/thread.c#L2175
 	    busy = 1;
 	}
     }
-    if (busy) {
-	rb_thread_schedule_limits(0);
-	goto retry;
-    }
+    return busy;
 }
 
 /*
Index: ruby_2_4/io.c
===================================================================
--- ruby_2_4/io.c	(revision 57871)
+++ ruby_2_4/io.c	(revision 57872)
@@ -4271,7 +4271,7 @@ static void free_io_buffer(rb_io_buffer_ https://github.com/ruby/ruby/blob/trunk/ruby_2_4/io.c#L4271
 static void clear_codeconv(rb_io_t *fptr);
 
 static void
-fptr_finalize(rb_io_t *fptr, int noraise)
+fptr_finalize_flush(rb_io_t *fptr, int noraise)
 {
     VALUE err = Qnil;
     int fd = fptr->fd;
@@ -4331,6 +4331,12 @@ fptr_finalize(rb_io_t *fptr, int noraise https://github.com/ruby/ruby/blob/trunk/ruby_2_4/io.c#L4331
 	else
 	    rb_exc_raise(err);
     }
+}
+
+static void
+fptr_finalize(rb_io_t *fptr, int noraise)
+{
+    fptr_finalize_flush(fptr, noraise);
     free_io_buffer(&fptr->rbuf);
     free_io_buffer(&fptr->wbuf);
     clear_codeconv(fptr);
@@ -4410,6 +4416,7 @@ rb_io_memsize(const rb_io_t *fptr) https://github.com/ruby/ruby/blob/trunk/ruby_2_4/io.c#L4416
     return size;
 }
 
+int rb_notify_fd_close(int fd);
 static rb_io_t *
 io_close_fptr(VALUE io)
 {
@@ -4417,6 +4424,7 @@ io_close_fptr(VALUE io) https://github.com/ruby/ruby/blob/trunk/ruby_2_4/io.c#L4424
     int fd;
     VALUE write_io;
     rb_io_t *write_fptr;
+    int busy;
 
     write_io = GetWriteIO(io);
     if (io != write_io) {
@@ -4431,7 +4439,11 @@ io_close_fptr(VALUE io) https://github.com/ruby/ruby/blob/trunk/ruby_2_4/io.c#L4439
     if (fptr->fd < 0) return 0;
 
     fd = fptr->fd;
-    rb_thread_fd_close(fd);
+    busy = rb_notify_fd_close(fd);
+    fptr_finalize_flush(fptr, FALSE);
+    if (busy) {
+	do rb_thread_schedule(); while (rb_notify_fd_close(fd));
+    }
     rb_io_fptr_cleanup(fptr, FALSE);
     return fptr;
 }
@@ -6762,7 +6774,7 @@ io_reopen(VALUE io, VALUE nfile) https://github.com/ruby/ruby/blob/trunk/ruby_2_4/io.c#L6774
             rb_update_max_fd(fd);
             fptr->fd = fd;
 	}
-	rb_thread_fd_close(fd);
+	rb_notify_fd_close(fd);
 	if ((orig->mode & FMODE_READABLE) && pos >= 0) {
 	    if (io_seek(fptr, pos, SEEK_SET) < 0 && errno) {
 		rb_sys_fail_path(fptr->pathv);

Property changes on: ruby_2_4
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r57422


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