* vm_core.h (RUBY_VM_CHECK_INTS_BLOCKING): check async queue everytime.

* thread.c (sleep_forever): check RUBY_VM_CHECK_INTS_BLOCKING first.
        * thread.c (sleep_timeval): ditto.
        * test/ruby/test_thread.rb (test_async_interrupt_blocking): add a test
          exceptions are correctly defared and raised on :on_blocking context.


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

ChangeLog

@@ -1,3 +1,11 @@
+Wed Dec  5 03:35:37 2012  Masaya Tarui  <tarui@ruby-lang.org>
+
+	* vm_core.h (RUBY_VM_CHECK_INTS_BLOCKING): check async queue everytime.
+        * thread.c (sleep_forever): check RUBY_VM_CHECK_INTS_BLOCKING first.
+        * thread.c (sleep_timeval): ditto.
+        * test/ruby/test_thread.rb (test_async_interrupt_blocking): add a test
+          exceptions are correctly defared and raised on :on_blocking context.
+
 Wed Dec  5 02:36:10 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* common.mk, defs/id.def, template/id.c.tmpl: generate id.c as well as id.h.

test/ruby/test_thread.rb

@@ -564,6 +564,30 @@ class TestThread < Test::Unit::TestCase
     }
   end
   
+  def test_async_interrupt_blocking
+    r=:ok
+    e=Class.new(Exception)
+    th_s = Thread.current
+    begin
+      th = Thread.start{
+        Thread.async_interrupt_timing(Object => :on_blocking){
+          begin
+            Thread.current.raise RuntimeError
+            sleep
+          ensure
+            th_s.raise e
+          end
+        }
+      }
+      sleep 1
+      r=:ng
+      th.raise RuntimeError
+      th.join
+    rescue e
+    end
+    assert_equal(:ok,r)
+  end
+
   def test_async_interrupted?
     q = Queue.new
     Thread.async_interrupt_timing(RuntimeError => :defer){

thread.c

@@ -69,6 +69,7 @@ static void sleep_forever(rb_thread_t *th, int nodeadlock, int spurious_check);
 static double timeofday(void);
 static int rb_threadptr_dead(rb_thread_t *th);
 static void rb_check_deadlock(rb_vm_t *vm);
+static int rb_threadptr_async_errinfo_empty_p(rb_thread_t *th);
 
 #define eKillSignal INT2FIX(0)
 #define eTerminateSignal INT2FIX(1)
@@ -888,7 +889,8 @@ sleep_forever(rb_thread_t *th, int deadlockable,int spurious_check)
     enum rb_thread_status status = deadlockable ? THREAD_STOPPED_FOREVER : THREAD_STOPPED;
 
     th->status = status;
-    do {
+    RUBY_VM_CHECK_INTS_BLOCKING(th);
+    while (th->status == status) {
 	if (deadlockable) {
 	    th->vm->sleeper++;
 	    rb_check_deadlock(th->vm);
@@ -898,7 +900,9 @@ sleep_forever(rb_thread_t *th, int deadlockable,int spurious_check)
 	    th->vm->sleeper--;
 	}
 	RUBY_VM_CHECK_INTS_BLOCKING(th);
-    } while (spurious_check && th->status == status);
+	if(!spurious_check)
+	    break;
+    }
     th->status = prev_status;
 }
 
@@ -932,7 +936,8 @@ sleep_timeval(rb_thread_t *th, struct timeval tv,int spurious_check)
     }
 
     th->status = THREAD_STOPPED;
-    do {
+    RUBY_VM_CHECK_INTS_BLOCKING(th);
+    while (th->status == THREAD_STOPPED) {
 	native_sleep(th, &tv);
 	RUBY_VM_CHECK_INTS_BLOCKING(th);
 	getclockofday(&tvn);
@@ -946,7 +951,9 @@ sleep_timeval(rb_thread_t *th, struct timeval tv,int spurious_check)
 	    --tv.tv_sec;
 	    tv.tv_usec += 1000000;
 	}
-    } while (spurious_check && th->status == THREAD_STOPPED);
+	if(!spurious_check)
+	    break;
+    }
     th->status = prev_status;
 }
 

vm_core.h

@@ -890,10 +890,15 @@ void rb_thread_lock_unlock(rb_thread_lock_t *);
 void rb_thread_lock_destroy(rb_thread_lock_t *);
 
 #define RUBY_VM_CHECK_INTS_BLOCKING(th) do {				\
-    if (UNLIKELY(RUBY_VM_INTERRUPTED_ANY(th))) { \
+	if (UNLIKELY(!rb_threadptr_async_errinfo_empty_p(th))) {	\
+	    th->async_errinfo_queue_checked = 0;			\
+	    RUBY_VM_SET_INTERRUPT(th);					\
 	    rb_threadptr_execute_interrupts(th, 1);			\
 	}								\
-} while (0)
+	else if (UNLIKELY(RUBY_VM_INTERRUPTED_ANY(th))) {		\
+	    rb_threadptr_execute_interrupts(th, 1);			\
+	}								\
+    } while (0)
 
 #define RUBY_VM_CHECK_INTS(th) do { \
     if (UNLIKELY(RUBY_VM_INTERRUPTED_ANY(th))) {	\