Changeset 8895 for trunk/src

Timestamp:

Jul 19, 2002, 1:06:45 PM (23 years ago)

Author:

sandervl

Message:

Dos*CriticalSection fixes

File:

• trunk/src/odincrt/critsect.cpp (modified) (9 diffs)

trunk/src/odincrt/critsect.cpp

@@ -1 @@
-/* $Id: critsect.cpp,v 1.3 2002-07-18 20:26:28 sandervl Exp $ */
+/* $Id: critsect.cpp,v 1.4 2002-07-19 11:06:45 sandervl Exp $ */
 /*
  * Critical sections
@@ -74 +74 @@
     crit->OwningThread   = 0;
 
-    rc = DosCreateMutexSem(pszSemName, &crit->hmtxLock, (pszSemName) ? DC_SEM_SHARED : 0, TRUE);
+    rc = DosCreateEventSem(pszSemName, &crit->hmtxLock, (pszSemName) ? DC_SEM_SHARED : 0, 0);
     if(rc != NO_ERROR) {
         DebugInt3();
@@ -96 +96 @@
     }
 
-    rc = DosOpenMutexSem(pszSemName, &hmtxLock);
+    rc = DosOpenEventSem(pszSemName, &hmtxLock);
     if(rc != NO_ERROR) {
         DebugInt3();
@@ -115 +115 @@
         crit->RecursionCount = 0;
         crit->OwningThread   = 0;
-        DosCloseMutexSem(crit->hmtxLock);
+        DosCloseEventSem(crit->hmtxLock);
         crit->hmtxLock       = 0;
         crit->Reserved       = (DWORD)-1;
@@ -128 +128 @@
 {
     DWORD res;
+    DWORD threadid = GetCurrentThreadId();
 
     if (!crit->hmtxLock)
@@ -135 +136 @@
     if (DosInterlockedIncrement( &crit->LockCount ))
     {
-        if (crit->OwningThread == GetCurrentThreadId())
+testenter:
+        if (crit->OwningThread == threadid)
         {
             crit->RecursionCount++;
@@ -141 +143 @@
         }
 
-        /* Now wait for it */
-        APIRET rc = DosRequestMutexSem(crit->hmtxLock, SEM_INDEFINITE_WAIT);
+        if(DosInterlockedCompareExchange((PLONG)&crit->OwningThread, threadid, 0)) 
+        {
+            ULONG ulnrposts;
+
+            /* Now wait for it */
+            APIRET rc = DosWaitEventSem(crit->hmtxLock, SEM_INDEFINITE_WAIT);
+            if(rc != NO_ERROR) {
+                DebugInt3();
+                return;
+            }
+            DosResetEventSem(crit->hmtxLock, &ulnrposts);
+            goto testenter;
+        }
     }
     crit->OwningThread   = GetCurrentThreadId();
@@ -161 +174 @@
             return TRUE;
         }
-        /* FIXME: this doesn't work */
         DosInterlockedDecrement( &crit->LockCount );
         return FALSE;
@@ -187 +199 @@
     {
         /* Someone is waiting */
-        DosReleaseMutexSem(crit->hmtxLock);
-    }
-}
-
+        DosPostEventSem(crit->hmtxLock);
+    }
+}
+