1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* io.c (io_binwrite): check interrupt before io issue.

Browse Source 
* test/ruby/test_thread.rb (test_async_interrupt_and_io):
  test for the above.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38224 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
kosaki 2012-12-05 19:37:37 +00:00
parent 84cfe8f8d6
commit def63c3466
3 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Thu Dec 6 04:27:10 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com>
* io.c (io_binwrite): check interrupt before io issue.
* test/ruby/test_thread.rb (test_async_interrupt_and_io):
test for the above.
Thu Dec 6 01:10:36 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> Thu Dec 6 01:10:36 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
* vm_eval.c (rb_method_call_status): use Qundef as no self instead of * vm_eval.c (rb_method_call_status): use Qundef as no self instead of

3
io.c
View File

@ -1120,6 +1120,9 @@ io_binwrite(VALUE str, const char *ptr, long len, rb_io_t *fptr, int nosync)
{ {
long n, r, offset = 0; long n, r, offset = 0;
/* don't write anything if current thread has a pending interrupt. */
rb_thread_check_ints();
if ((n = len) <= 0) return n; if ((n = len) <= 0) return n;
if (fptr->wbuf.ptr == NULL && !(!nosync && (fptr->mode & FMODE_SYNC))) { if (fptr->wbuf.ptr == NULL && !(!nosync && (fptr->mode & FMODE_SYNC))) {
fptr->wbuf.off = 0; fptr->wbuf.off = 0;

20
test/ruby/test_thread.rb
View File

@ -617,6 +617,26 @@ class TestThread < Test::Unit::TestCase
assert_equal(:ok,r) assert_equal(:ok,r)
end end
def test_async_interrupt_and_io
assert_in_out_err([], <<-INPUT, %w(ok), [])
th_waiting = true
t = Thread.new {
Thread.async_interrupt_timing(RuntimeError => :on_blocking) {
nil while th_waiting
# async interrupt should be raised _before_ writing puts arguments
puts "ng"
}
}
sleep 0.1
t.raise RuntimeError
th_waiting = false
t.join rescue nil
puts "ok"
INPUT
end
def test_async_interrupted? def test_async_interrupted?
q = Queue.new q = Queue.new
Thread.async_interrupt_timing(RuntimeError => :defer){ Thread.async_interrupt_timing(RuntimeError => :defer){