Changeset 9336 for trunk/src

Timestamp:

Oct 8, 2002, 11:49:08 AM (23 years ago)

Author:

sandervl

Message:

Updates for shared critical sections

Location:

trunk/src/odincrt

Files:

• critsect.cpp (modified) (7 diffs)
• odin36.def (modified) (2 diffs)
• odin36d.def (modified) (2 diffs)
• odincrt.def (modified) (2 diffs)
• odincrtd.def (modified) (2 diffs)
• odincrtp.def (modified) (2 diffs)

trunk/src/odincrt/critsect.cpp

@@ -1 @@
-/* $Id: critsect.cpp,v 1.6 2002-10-07 16:28:13 sandervl Exp $ */
+/* $Id: critsect.cpp,v 1.7 2002-10-08 09:49:06 sandervl Exp $ */
 /*
  * Critical sections in the Win32 sense
@@ -72 +72 @@
  *           DosInitializeCriticalSection
  */
-ULONG WIN32API DosInitializeCriticalSection(CRITICAL_SECTION_OS2 *crit, PSZ pszSemName)
+ULONG WIN32API DosInitializeCriticalSection(CRITICAL_SECTION_OS2 *crit, 
+                                            PSZ pszSemName, BOOL fShared)
 {
     APIRET rc;
@@ -81 +82 @@
     crit->OwningThread   = 0;
 
-    rc = DosCreateEventSem(pszSemName, &crit->hmtxLock, (pszSemName) ? DC_SEM_SHARED : 0, 0);
+    rc = DosCreateEventSem(pszSemName, &crit->hmtxLock, (pszSemName || fShared) ? DC_SEM_SHARED : 0, 0);
     if(rc != NO_ERROR) {
         DebugInt3();
@@ -87 +88 @@
         return rc;
     }
+    crit->CreationCount  = 1;
     crit->Reserved       = GetCurrentProcessId();
     return NO_ERROR;
@@ -95 +97 @@
  *           DosAccessCriticalSection
  */
-ULONG WIN32API DosAccessCriticalSection(CRITICAL_SECTION_OS2 *, PSZ pszSemName)
+ULONG WIN32API DosAccessCriticalSection(CRITICAL_SECTION_OS2 *crit, PSZ pszSemName)
 {
     HMTX   hmtxLock = 0;
     APIRET rc;
 
+    if(pszSemName == NULL && crit->hmtxLock == 0) {
+        DebugInt3();
+        return ERROR_INVALID_PARAMETER;
+    }
     if(pszSemName == NULL) {
-        DebugInt3();
-        return ERROR_INVALID_PARAMETER;
+        hmtxLock = crit->hmtxLock;
     }
 
@@ -110 +115 @@
         return rc;
     }
+    DosInterlockedIncrement(&crit->CreationCount);
     return NO_ERROR;
 }
@@ -123 +129 @@
            DebugInt3();
         }
-        crit->LockCount      = -1;
-        crit->RecursionCount = 0;
-        crit->OwningThread   = 0;
         DosCloseEventSem(crit->hmtxLock);
-        crit->hmtxLock       = 0;
-        crit->Reserved       = (DWORD)-1;
+        if(DosInterlockedDecrement(&crit->CreationCount) == 0)
+        {
+            crit->LockCount      = -1;
+            crit->RecursionCount = 0;
+            crit->OwningThread   = 0;
+            crit->hmtxLock       = 0;
+            crit->Reserved       = (DWORD)-1;
+        }
     }
     return NO_ERROR;

trunk/src/odincrt/odin36.def

@@ -1 @@
-; $Id: odin36.def,v 1.6 2002-10-07 16:28:13 sandervl Exp $
+; $Id: odin36.def,v 1.7 2002-10-08 09:49:07 sandervl Exp $
 ; Odin VAC++ 3.6.5 shared multithreaded runtime
 LIBRARY ODINCRT INITINSTANCE TERMINSTANCE
@@ -979 +979 @@
     _DosDeleteCriticalSection@4                        @1200 NONAME
     _DosEnterCriticalSection@8                         @1201 NONAME
-    _DosInitializeCriticalSection@8                    @1202 NONAME
+    _DosInitializeCriticalSection@12                   @1202 NONAME
     _DosAccessCriticalSection@8                        @1203 NONAME
     _DosLeaveCriticalSection@4                         @1204 NONAME

trunk/src/odincrt/odin36d.def

@@ -1 @@
-; $Id: odin36d.def,v 1.6 2002-10-07 16:28:14 sandervl Exp $
+; $Id: odin36d.def,v 1.7 2002-10-08 09:49:07 sandervl Exp $
 ; Odin VAC++ 3.6.5 shared multithreaded runtime
 LIBRARY ODINCRTD INITINSTANCE TERMINSTANCE
@@ -987 +987 @@
     _DosDeleteCriticalSection@4                        @1200 NONAME
     _DosEnterCriticalSection@8                         @1201 NONAME
-    _DosInitializeCriticalSection@8                    @1202 NONAME
+    _DosInitializeCriticalSection@12                   @1202 NONAME
     _DosAccessCriticalSection@8                        @1203 NONAME
     _DosLeaveCriticalSection@4                         @1204 NONAME

trunk/src/odincrt/odincrt.def

@@ -1 @@
-; $Id: odincrt.def,v 1.26 2002-10-07 16:28:14 sandervl Exp $
+; $Id: odincrt.def,v 1.27 2002-10-08 09:49:07 sandervl Exp $
 ; Odin VAC++ 3.08 shared multithreaded runtime
 LIBRARY ODINCRT INITINSTANCE TERMINSTANCE
@@ -957 +957 @@
     _DosDeleteCriticalSection@4                        @1200 NONAME
     _DosEnterCriticalSection@8                         @1201 NONAME
-    _DosInitializeCriticalSection@8                    @1202 NONAME
+    _DosInitializeCriticalSection@12                   @1202 NONAME
     _DosAccessCriticalSection@8                        @1203 NONAME
     _DosLeaveCriticalSection@4                         @1204 NONAME

trunk/src/odincrt/odincrtd.def

@@ -1 @@
-; $Id: odincrtd.def,v 1.7 2002-10-07 16:28:14 sandervl Exp $
+; $Id: odincrtd.def,v 1.8 2002-10-08 09:49:08 sandervl Exp $
 ; Odin VAC++ 3.08 shared multithreaded runtime
 LIBRARY ODINCRTD INITINSTANCE TERMINSTANCE
@@ -959 +959 @@
     _DosDeleteCriticalSection@4                        @1200 NONAME
     _DosEnterCriticalSection@8                         @1201 NONAME
-    _DosInitializeCriticalSection@8                    @1202 NONAME
+    _DosInitializeCriticalSection@12                   @1202 NONAME
     _DosAccessCriticalSection@8                        @1203 NONAME
     _DosLeaveCriticalSection@4                         @1204 NONAME

trunk/src/odincrt/odincrtp.def

@@ -1 @@
-; $Id: odincrtp.def,v 1.4 2002-10-07 16:28:15 sandervl Exp $
+; $Id: odincrtp.def,v 1.5 2002-10-08 09:49:08 sandervl Exp $
 ; Odin VAC++ 3.08 shared multithreaded runtime
 LIBRARY ODINCRTP INITINSTANCE TERMINSTANCE
@@ -980 +980 @@
     _DosDeleteCriticalSection@4                        @1200 NONAME
     _DosEnterCriticalSection@8                         @1201 NONAME
-    _DosInitializeCriticalSection@8                    @1202 NONAME
+    _DosInitializeCriticalSection@12                   @1202 NONAME
     _DosAccessCriticalSection@8                        @1203 NONAME
     _DosLeaveCriticalSection@4                         @1204 NONAME