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

Timestamp:

Oct 25, 1999, 12:53:25 AM (26 years ago)

Author:

sandervl

Message:

Shared memory mapping changes

File:

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

trunk/src/kernel32/mmap.cpp

@@ -1 @@
-/* $Id: mmap.cpp,v 1.18 1999-09-01 00:03:51 phaller Exp $ */
+/* $Id: mmap.cpp,v 1.19 1999-10-24 22:51:21 sandervl Exp $ */
 
 /*
@@ -30 +30 @@
 #include "oslibdos.h"
 
-VMutex globalmapMutex;
-VMutex globalviewMutex;
+//Global DLL Data
+#pragma data_seg(_GLOBALDATA)
+Win32MemMapView *Win32MemMapView::mapviews = NULL;
+Win32MemMap     *Win32MemMap::memmaps = NULL;
+VMutex           globalmapMutex(VMUTEX_SHARED);
+VMutex           globalviewMutex(VMUTEX_SHARED);
+#pragma data_seg()
 
 //******************************************************************************
@@ -48 +53 @@
   mSize      = size;
   mProtFlags = fdwProtect;
+  mProcessId  = GetCurrentProcess();
 
   if(lpszName) {
-        lpszMapName = (char *)malloc(strlen(lpszName)+1);
+        lpszMapName = (char *)_smalloc(strlen(lpszName)+1);
         strcpy(lpszMapName, lpszName);
   }
@@ -62 +68 @@
   if(hMemFile != -1)
   {
-        if(DuplicateHandle(GetCurrentProcess(), hMemFile, GetCurrentProcess(),
+        if(DuplicateHandle(mProcessId, hMemFile, GetCurrentProcess(),
                            &hMemFile, 0, FALSE, DUPLICATE_SAME_ACCESS) == FALSE)
         {
@@ -87 +93 @@
 Win32MemMap::~Win32MemMap()
 {
-  for(int i=0;i<nrMappings;i++) {
-        Win32MemMapView::deleteView(this); //delete all views of our memory mapped file
-  }
+  Win32MemMapView::deleteViews(this); //delete all views of our memory mapped file
+
   mapMutex.enter();
   if(lpszMapName) {
@@ -95 +100 @@
   }
   if(pMapping) {
-        VirtualFree(pMapping, mSize, MEM_RELEASE);
+        if(lpszMapName) {
+                OSLibDosFreeMem(pMapping);
+        }
+        else    VirtualFree(pMapping, mSize, MEM_RELEASE);
+
         pMapping = NULL;
   }
@@ -206 +215 @@
 }
 //******************************************************************************
-//todo: unalias memory
 //******************************************************************************
 BOOL Win32MemMap::unmapViewOfFile(Win32MemMapView *view)
@@ -231 +239 @@
 LPVOID Win32MemMap::mapViewOfFile(ULONG size, ULONG offset, ULONG fdwAccess)
 {
+ DWORD processId = GetCurrentProcess();
+
   mapMutex.enter();
   ULONG memFlags = (mProtFlags & (PAGE_READONLY | PAGE_READWRITE | PAGE_WRITECOPY));
@@ -270 +280 @@
         //     when allocating memory with the PAG_ANY bit set. (without this
         //     flag it will also crash)
-        pMapping = VirtualAlloc(0, mSize, fAlloc, PAGE_READWRITE);
+        if(lpszMapName) {
+                pMapping = VirtualAllocShared(mSize, fAlloc, PAGE_READWRITE, lpszMapName);
+        }
+        else {
+                pMapping = VirtualAlloc(0, mSize, fAlloc, PAGE_READWRITE);
+        }
         if(pMapping == NULL) {
                 dprintf(("Win32MemMap::mapFileView: VirtualAlloc %x %x %x failed!", mSize, fAlloc, memFlags));
@@ -375 +390 @@
 Win32MemMap *Win32MemMap::findMap(LPSTR lpszName)
 {
+  if(lpszName == NULL)
+        return NULL;
+
   globalmapMutex.enter();
   Win32MemMap *map = memmaps;
@@ -414 +432 @@
 void Win32MemMap::deleteAll()
 {
-  while(memmaps) {
-        CloseHandle(memmaps->hMemMap);
-  }
-}
-//******************************************************************************
-//******************************************************************************
-Win32MemMap *Win32MemMap::memmaps = NULL;
-
+ Win32MemMap *map = memmaps, *nextmap;
+ DWORD processId = GetCurrentProcess();
+
+  //delete all maps created by this process
+  while(map) {
+        nextmap = map->next;
+        if(map->getProcessId() == processId) {
+                CloseHandle(memmaps->hMemMap);
+        }
+        else {
+                //delete all views created by this process for this map
+                Win32MemMapView::deleteViews(map); 
+        }
+        map = nextmap;
+  }
+}
 //******************************************************************************
 //******************************************************************************
@@ -435 +461 @@
   mSize    = size;
   mOffset  = offset;
+  mProcessId = GetCurrentProcess();
 
   switch(fdwAccess) {
@@ -447 +474 @@
         break;
   }
+  if(map->getMemName() != NULL) {
+        //shared memory map, so map it into our address space
+        if(OSLibDosGetNamedSharedMem((LPVOID *)&viewaddr, map->getMemName()) != OSLIB_NOERROR) {
+                dprintf(("new OSLibDosGetNamedSharedMem FAILED"));
+                SetLastError(ERROR_NOT_ENOUGH_MEMORY);
+                errorState = 1;
+                return;
+        }
+  }
+  
   if(OSLibDosAliasMem(viewaddr, size, &pMapView, accessAttr) != OSLIB_NOERROR) {
         dprintf(("new OSLibDosAliasMem FAILED"));
@@ -506 +543 @@
 //******************************************************************************
 //******************************************************************************
-void Win32MemMapView::deleteView(Win32MemMap *map)
-{
+void Win32MemMapView::deleteViews(Win32MemMap *map)
+{
+  DWORD processId = GetCurrentProcess();
+
   globalviewMutex.enter();
-  Win32MemMapView *view = mapviews;
+  Win32MemMapView *view = mapviews, *nextview;
 
   if(view != NULL) {
         while(view) {
-                if(view->getParentMap() == map)
+                nextview = view->next;
+                if(view->getParentMap() == map && view->getProcessId() == processId)
                 {
                         globalviewMutex.leave();
                         delete view;
-                        return;
-                }
-                view = view->next;
+                        globalviewMutex.enter();
+                }
+                view = nextview;
         }
   }
@@ -573 +613 @@
 //******************************************************************************
 //******************************************************************************
-Win32MemMapView *Win32MemMapView::mapviews = NULL;
-
+