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

Timestamp:

May 26, 2000, 8:42:57 PM (25 years ago)

Author:

sandervl

Message:

memory map bugfixes + added method for querying image size

File:

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

trunk/src/kernel32/mmap.cpp

@@ -1 @@
-/* $Id: mmap.cpp,v 1.40 2000-05-24 19:28:26 sandervl Exp $ */
+/* $Id: mmap.cpp,v 1.41 2000-05-26 18:42:55 sandervl Exp $ */
 
 /*
@@ -17 +17 @@
  * TODO: Sharing memory mapped files between multiple processes
  * TODO: Memory mapped files with views that extend the file (not 100% correct now)
+ * TODO: Suspend all threads when a page is committed (possible that another thread
+ *       accesses the same memory before the page is read from disk
  *
  * Project Odin Software License can be found in LICENSE.TXT
@@ -52 +54 @@
 //******************************************************************************
 Win32MemMap::Win32MemMap(HFILE hfile, ULONG size, ULONG fdwProtect, LPSTR lpszName)
-               : nrMappings(0), pMapping(NULL), mMapAccess(0), referenced(0), image(0)
+               : nrMappings(0), pMapping(NULL), mMapAccess(0), referenced(0), image(0),
+                 fClosed(FALSE)
 {
   globalmapMutex.enter(VMUTEX_WAIT_FOREVER, &hGlobalMapMutex);
@@ -75 +78 @@
 //******************************************************************************
 Win32MemMap::Win32MemMap(Win32PeLdrImage *pImage, ULONG baseAddress, ULONG size)
-               : nrMappings(0), pMapping(NULL), mMapAccess(0), referenced(0)
+               : nrMappings(0), pMapping(NULL), mMapAccess(0), referenced(0), image(0),
+                 fClosed(FALSE)
 {
   globalmapMutex.enter(VMUTEX_WAIT_FOREVER, &hGlobalMapMutex);
@@ -292 +296 @@
   }
   mapMutex.leave();
+  
+  //if there are no more mappings left and the memory map's handle has been
+  //closed, then delete the object
+  if(nrMappings == 0 && fClosed) {
+        delete this;
+  }
   return TRUE;
 fail:
@@ -526 +536 @@
                         delete map;
                 }
-                else    CloseHandle(memmaps->hMemMap);
+                else {
+                        if(!map->isClosed()) 
+                                CloseHandle(memmaps->hMemMap);
+                        delete map;
+                }
         }
         else {