Check for signals to be delivered after every syscall. This avoids

some obscure deadlock cases.  (Neil Conway).

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@487

diff --git a/coregrind/vg_scheduler.c b/coregrind/vg_scheduler.c
index 8881f9ae64c5312ad5c40f077aec1aa1ab0f39dc..74af761290a7d6e37006158d803d30f0caec817f 100644 (file)
--- a/coregrind/vg_scheduler.c
+++ b/coregrind/vg_scheduler.c
@@ -1368,10 +1368,17 @@ VgSchedReturnCode VG_(scheduler) ( void )
             }
 #           endif
 
-            if (VG_(threads)[tid].status == VgTs_Runnable)
+            if (VG_(threads)[tid].status == VgTs_Runnable) {
+               /* Better do a signal check, since if in a tight loop
+                  with a slow syscall it may be a very long time
+                  before we get back to the main signal check in Stage 1. */
+               sigs_delivered = VG_(deliver_signals)();
+               if (sigs_delivered)
+                  VG_(do_sanity_checks)( False );
                continue; /* with this thread */
-            else
-               goto stage1;          
+            } else {
+               goto stage1;
+            }
         }
 
         /* It's an event we can't quickly deal with.  Give up running

diff --git a/vg_scheduler.c b/vg_scheduler.c
index 8881f9ae64c5312ad5c40f077aec1aa1ab0f39dc..74af761290a7d6e37006158d803d30f0caec817f 100644 (file)
--- a/vg_scheduler.c
+++ b/vg_scheduler.c
@@ -1368,10 +1368,17 @@ VgSchedReturnCode VG_(scheduler) ( void )
             }
 #           endif
 
-            if (VG_(threads)[tid].status == VgTs_Runnable)
+            if (VG_(threads)[tid].status == VgTs_Runnable) {
+               /* Better do a signal check, since if in a tight loop
+                  with a slow syscall it may be a very long time
+                  before we get back to the main signal check in Stage 1. */
+               sigs_delivered = VG_(deliver_signals)();
+               if (sigs_delivered)
+                  VG_(do_sanity_checks)( False );
                continue; /* with this thread */
-            else
-               goto stage1;          
+            } else {
+               goto stage1;
+            }
         }
 
         /* It's an event we can't quickly deal with.  Give up running