* thread.c (struct rb_mutex_struct): add allow_trap field.

* internal.h (rb_mutex_allow_trap): added.
* thread.c (rb_mutex_lock, rb_mutex_unlock): check mutex->allow_trap.
* thread.c (mutex_sleep): remove trap check because it uses
  rb_mutex_lock and rb_mutex_unlock internally.
* thread.c (rb_mutex_allow_trap): new helper function for the above.

* io.c (io_binwrite): mark fptr->write_lock as writable in trap.

* test/ruby/test_signal.rb (test_trap_puts): test for the above.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37930 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 13 insertions, 0 deletions

diff --git a/test/ruby/test_signal.rb b/test/ruby/test_signal.rb
index 63d6d9d9f0..3a89240f44 100644
--- a/test/ruby/test_signal.rb
+++ b/test/ruby/test_signal.rb
@@ -260,4 +260,17 @@ EOS
       end
     end
   end
+
+  def test_trap_puts
+    assert_in_out_err([], <<-INPUT, ["a"*10000], [])
+      Signal.trap(:INT) {
+          # for enable internal io mutex
+          sync = false
+          # larger than internal io buffer
+          print "a"*10000
+      }
+      Process.kill :INT, $$
+      sleep 0.1
+    INPUT
+  end
 end