Changeset 3206 for trunk/src/kernel32/mmap.cpp

Timestamp:

Mar 23, 2000, 8:23:48 PM (25 years ago)

Author:

sandervl

Message:

mutex fixes + added vsemaphore class

File:

• trunk/src/kernel32/mmap.cpp (modified) (10 diffs)

trunk/src/kernel32/mmap.cpp

@@ -1 @@
-/* $Id: mmap.cpp,v 1.36 2000-03-09 19:03:19 sandervl Exp $ */
+/* $Id: mmap.cpp,v 1.37 2000-03-23 19:23:47 sandervl Exp $ */
 
 /*
@@ -35 +35 @@
 #include "dbglocal.h"
 
+//NOTE: This must be in the local data segment -> if a shared semaphore was
+//      created by a different process, the handle returned by DosOpenMutexSem
+//      will be returned in hGlobalMapMutex
+HMTX             hGlobalMapMutex = 0;
+
 //Global DLL Data
 #pragma data_seg(_GLOBALDATA)
 Win32MemMap     *Win32MemMap::memmaps = NULL;
-VMutex           globalmapMutex(VMUTEX_SHARED);
+VMutex           globalmapMutex(VMUTEX_SHARED, &hGlobalMapMutex);
 #pragma data_seg()
 VMutex           globalviewMutex;
@@ -49 +54 @@
                : nrMappings(0), pMapping(NULL), mMapAccess(0), referenced(0), image(0)
 {
-  globalmapMutex.enter();
+  globalmapMutex.enter(VMUTEX_WAIT_FOREVER, &hGlobalMapMutex);
   next    = memmaps;
   memmaps = this;
-  globalmapMutex.leave();
+  globalmapMutex.leave(&hGlobalMapMutex);
 
   hMemFile   = hfile;
@@ -72 +77 @@
                : nrMappings(0), pMapping(NULL), mMapAccess(0), referenced(0)
 {
-  globalmapMutex.enter();
+  globalmapMutex.enter(VMUTEX_WAIT_FOREVER, &hGlobalMapMutex);
   next    = memmaps;
   memmaps = this;
-  globalmapMutex.leave();
+  globalmapMutex.leave(&hGlobalMapMutex);
 
   hMemFile   = -1;
@@ -148 +153 @@
   mapMutex.leave();
 
-  globalmapMutex.enter();
+  globalmapMutex.enter(VMUTEX_WAIT_FOREVER, &hGlobalMapMutex);
   Win32MemMap *map = memmaps;
 
@@ -165 +170 @@
         else    dprintf(("Win32MemMap::~Win32MemMap: map not found!! (%x)", this));
   }
-  globalmapMutex.leave();
+  globalmapMutex.leave(&hGlobalMapMutex);
 }
 //******************************************************************************
@@ -467 +472 @@
         return NULL;
 
-  globalmapMutex.enter();
+  globalmapMutex.enter(VMUTEX_WAIT_FOREVER, &hGlobalMapMutex);
   Win32MemMap *map = memmaps;
 
@@ -477 +482 @@
         }
   }
-  globalmapMutex.leave();
+  globalmapMutex.leave(&hGlobalMapMutex);
   if(!map) dprintf(("Win32MemMap::findMap: couldn't find map %s", lpszName));
   return map;
@@ -485 +490 @@
 Win32MemMap *Win32MemMap::findMap(ULONG address)
 {
-  globalmapMutex.enter();
+  globalmapMutex.enter(VMUTEX_WAIT_FOREVER, &hGlobalMapMutex);
   Win32MemMap *map = memmaps;
 
@@ -498 +503 @@
         }
   }
-  globalmapMutex.leave();
+  globalmapMutex.leave(&hGlobalMapMutex);
   return map;
 }