upmerge r5768 (Allow a thread to spin longer when yielding before

switching to a different thread.)

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

diff --git a/coregrind/m_scheduler/scheduler.c b/coregrind/m_scheduler/scheduler.c
index 1b62f1a692d87f1817ed4e8ae62b0e808100b44c..b5ad40cef23e204f9fb07fc5ead5db134b2889ed 100644 (file)
--- a/coregrind/m_scheduler/scheduler.c
+++ b/coregrind/m_scheduler/scheduler.c
@@ -883,8 +883,8 @@ VgSchedReturnCode VG_(scheduler) ( ThreadId tid )
             before swapping to another.  That means that short term
             spins waiting for hardware to poke memory won't cause a
             thread swap. */
-        if (VG_(dispatch_ctr) > 100) 
-            VG_(dispatch_ctr) = 100;
+        if (VG_(dispatch_ctr) > 2000) 
+            VG_(dispatch_ctr) = 2000;
         break;
 
       case VG_TRC_INNER_COUNTERZERO: