[PATCH 2/2] ntdll: Simplify critical section timeout logic.

[Zebediah Figura]

From: Zebediah Figura

Make it more consistent, as well. Currently we alternate between 5 seconds and
60; instead just make it a consistent 60 after the first wait.

When +relay is on, always wait for 300 seconds, instead of alternating between
60 and 300.
---
 dlls/ntdll/sync.c | 22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/dlls/ntdll/sync.c b/dlls/ntdll/sync.c
index 9e4aa38ff2b..fa64917029a 100644
--- a/dlls/ntdll/sync.c
+++ b/dlls/ntdll/sync.c
@@ -299,6 +299,8 @@ NTSTATUS WINAPI RtlDeleteCriticalSection( RTL_CRITICAL_SECTION *crit )
  */
 NTSTATUS WINAPI RtlpWaitForCriticalSection( RTL_CRITICAL_SECTION *crit )
 {
+    unsigned int timeout = 5;
+
     /* Don't allow blocking on a critical section during process termination */
     if (RtlDllShutdownInProgress())
     {
@@ -309,24 +311,14 @@ NTSTATUS WINAPI RtlpWaitForCriticalSection( RTL_CRITICAL_SECTION *crit )

for (;;)
     {
-        NTSTATUS status = wait_semaphore( crit, 5 );
+        NTSTATUS status = wait_semaphore( crit, timeout );

-        if ( status == STATUS_TIMEOUT )
-        {
-            const char *name = crit_section_get_name( crit );
+        if (status == STATUS_WAIT_0) break;

-            ERR( "section %p %s wait timed out in thread %04lx, blocked by %04lx, retrying (60 sec)\n",
-                 crit, debugstr_a(name), GetCurrentThreadId(), HandleToULong(crit->OwningThread) );
-            status = wait_semaphore( crit, 60 );
+        timeout = (TRACE_ON(relay) ? 300 : 60);

-            if ( status == STATUS_TIMEOUT && TRACE_ON(relay) )
-            {
-                ERR( "section %p %s wait timed out in thread %04lx, blocked by %04lx, retrying (5 min)\n",
-                     crit, debugstr_a(name), GetCurrentThreadId(), HandleToULong(crit->OwningThread) );
-                status = wait_semaphore( crit, 300 );
-            }
-        }
-        if (status == STATUS_WAIT_0) break;
+        ERR( "section %p %s wait timed out in thread %04lx, blocked by %04lx, retrying (%u sec)\n",
+             crit, debugstr_a(crit_section_get_name(crit)), GetCurrentThreadId(), HandleToULong(crit->OwningThread), timeout );
     }
     if (crit_section_has_debuginfo( crit )) crit->DebugInfo->ContentionCount++;
     return STATUS_SUCCESS;