ruby-changes:46910
From: ko1 <ko1@a...>
Date: Tue, 6 Jun 2017 16:11:32 +0900 (JST)
Subject: [ruby-changes:46910] ko1:r59025 (trunk): re-revert r59020
ko1 2017-06-06 16:11:28 +0900 (Tue, 06 Jun 2017) New Revision: 59025 https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=59025 Log: re-revert r59020 Modified files: trunk/test/ruby/test_io.rb trunk/thread.c Index: test/ruby/test_io.rb =================================================================== --- test/ruby/test_io.rb (revision 59024) +++ test/ruby/test_io.rb (revision 59025) @@ -2823,28 +2823,6 @@ __END__ https://github.com/ruby/ruby/blob/trunk/test/ruby/test_io.rb#L2823 end; end - def test_single_exception_on_close - a = [] - t = [] - 10.times do - r, w = IO.pipe - a << [r, w] - t << Thread.new do - while r.gets - end rescue IOError - Thread.current.pending_interrupt? - end - end - a.each do |r, w| - w.write -"\n" - w.close - r.close - end - t.each do |th| - assert_equal false, th.value, '[ruby-core:81581] [Bug #13632]' - end - end - def test_open_mode feature4742 = "[ruby-core:36338]" bug6055 = '[ruby-dev:45268]' Index: thread.c =================================================================== --- thread.c (revision 59024) +++ thread.c (revision 59025) @@ -2213,8 +2213,6 @@ rb_notify_fd_close(int fd) https://github.com/ruby/ruby/blob/trunk/thread.c#L2213 if (wfd->fd == fd) { rb_thread_t *th = wfd->th; VALUE err = th->vm->special_exceptions[ruby_error_stream_closed]; - - wfd->fd = -1; /* ensure we only enqueue once */ rb_threadptr_pending_interrupt_enque(th, err); rb_threadptr_interrupt(th); busy = 1; -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/