Changeset 3275 for trunk/src/kernel32/critsection.cpp

Timestamp:

Mar 29, 2000, 7:17:18 PM (25 years ago)

Author:

sandervl

Message:

Critical section changes

File:

• trunk/src/kernel32/critsection.cpp (modified) (2 diffs)

trunk/src/kernel32/critsection.cpp

@@ -1 @@
-/* $Id: critsection.cpp,v 1.4 2000-02-16 14:25:36 sandervl Exp $ */
+/* $Id: critsection.cpp,v 1.5 2000-03-29 17:17:17 sandervl Exp $ */
 /*
  * Win32 critical sections
@@ -87 +87 @@
             return;
         }
+
         /* Now wait for it */
-
-        if ( crit->Reserved && crit->Reserved != GetCurrentProcessId() )
+        for (;;)
         {
-            dprintf(("Crst %p belongs to process %ld, current is %ld!\n", 
-                          crit, crit->Reserved, GetCurrentProcessId() ));
-            return;
-        }
-
-        res = ODIN_WaitForSingleObject( crit->LockSemaphore, 5000L );
-        if ( res == WAIT_TIMEOUT )
-        {
-            dprintf(("Critical section %p wait timed out, retrying (60 sec)\n", crit ));
-            res = WaitForSingleObject( crit->LockSemaphore, 60000L );
-        }
-        if ( res == WAIT_TIMEOUT && TRACE_ON(relay) )
-        {
-            dprintf(("Critical section %p wait timed out, retrying (5 min)\n", crit ));
-            res = WaitForSingleObject( crit->LockSemaphore, 300000L );
-        }
-        if (res != STATUS_WAIT_0)
-        {
-            dprintf(("Critical section %p wait failed err=%lx\n", crit, res ));
-            /* FIXME: should raise an exception */
+            res = ODIN_WaitForSingleObject( crit->LockSemaphore, 5000L );
+            if ( res == WAIT_TIMEOUT )
+            {
+                dprintf(("Critical section %p wait timed out, retrying (60 sec)\n", crit ));
+                res = ODIN_WaitForSingleObject( crit->LockSemaphore, 60000L );
+                if ( res == WAIT_TIMEOUT && TRACE_ON(relay) )
+                {
+                    dprintf(("Critical section %p wait timed out, retrying (5 min)\n", crit ));
+                    res = WaitForSingleObject( crit->LockSemaphore, 300000L );
+                }
+            }
+            if (res == STATUS_WAIT_0) break;
+
+#if 0
+            EXCEPTION_RECORD rec;
+
+            rec.ExceptionCode    = EXCEPTION_CRITICAL_SECTION_WAIT;
+            rec.ExceptionFlags   = 0;
+            rec.ExceptionRecord  = NULL;
+            rec.ExceptionAddress = RaiseException;  /* sic */
+            rec.NumberParameters = 1;
+            rec.ExceptionInformation[0] = (DWORD)crit;
+            RtlRaiseException( &rec );
+#endif
+            RaiseException(EXCEPTION_CRITICAL_SECTION_WAIT, 0, 1, (DWORD *)crit);
         }
     }