From c62ec3ae1aa5ac3b3f7f2756763a41c5703c06ca Mon Sep 17 00:00:00 2001
From: kosaki <kosaki@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 30 Nov 2012 18:55:28 +0000
Subject: [PATCH] * lib/sync.rb (Sync_m#sync_synchronize): add
 Thread.async_interrupt_timing   for protecting from async interrupt. *
 lib/sync.rb (Sync_m#sync_lock): ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38089 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog   |  6 ++++++
 lib/sync.rb | 43 +++++++++++++++++++++++--------------------
 2 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6d4b446ef0..8e6adb6c97 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sat Dec  1 03:49:45 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
+
+	* lib/sync.rb (Sync_m#sync_synchronize): add Thread.async_interrupt_timing
+	  for protecting from async interrupt.
+	* lib/sync.rb (Sync_m#sync_lock): ditto.
+
 Sat Dec  1 03:38:04 2012  KOSAKI Motohiro  <kosaki.motohiro@gmail.com>
 
 	* lib/thread.rb (ConditionVariable#broadcast): s/RuntimeError/StandardError/
diff --git a/lib/sync.rb b/lib/sync.rb
index 524f3804e9..378c659b7b 100644
--- a/lib/sync.rb
+++ b/lib/sync.rb
@@ -135,25 +135,26 @@ module Sync_m
 
   def sync_lock(m = EX)
     return unlock if m == UN
-
-    while true
-      @sync_mutex.synchronize do
-        begin
-          if sync_try_lock_sub(m)
-            return self
-          else
-            if sync_sh_locker[Thread.current]
-              sync_upgrade_waiting.push [Thread.current, sync_sh_locker[Thread.current]]
-              sync_sh_locker.delete(Thread.current)
+    Thread.async_interrupt_timing(StandardError => :on_blocking) do
+      while true
+        @sync_mutex.synchronize do
+          begin
+            if sync_try_lock_sub(m)
+              return self
             else
-              unless sync_waiting.include?(Thread.current) || sync_upgrade_waiting.reverse_each.any?{|w| w.first == Thread.current }
-                sync_waiting.push Thread.current
+              if sync_sh_locker[Thread.current]
+                sync_upgrade_waiting.push [Thread.current, sync_sh_locker[Thread.current]]
+                sync_sh_locker.delete(Thread.current)
+              else
+                unless sync_waiting.include?(Thread.current) || sync_upgrade_waiting.reverse_each.any?{|w| w.first == Thread.current }
+                  sync_waiting.push Thread.current
+                end
               end
+              @sync_mutex.sleep
             end
-            @sync_mutex.sleep
+          ensure
+            sync_waiting.delete(Thread.current)
           end
-        ensure
-          sync_waiting.delete(Thread.current)
         end
       end
     end
@@ -226,11 +227,13 @@ module Sync_m
   end
 
   def sync_synchronize(mode = EX)
-    sync_lock(mode)
-    begin
-      yield
-    ensure
-      sync_unlock
+    Thread.async_interrupt_timing(StandardError => :on_blocking) do
+      sync_lock(mode)
+      begin
+        yield
+      ensure
+        sync_unlock
+      end
     end
   end