Changeset 8456 for trunk/src

Timestamp:

May 20, 2002, 3:47:59 PM (23 years ago)

Author:

sandervl

Message:

DF: Removed 64 MB memory mapped file limit & Fix for opening memory mapped file with size larger than the file size

Location:

trunk/src/kernel32

Files:

• hmmmap.cpp (modified) (5 diffs)
• mmap.cpp (modified) (6 diffs)
• mmap.h (modified) (2 diffs)

trunk/src/kernel32/hmmmap.cpp

@@ -1 @@
-/* $Id: hmmmap.cpp,v 1.19 2002-03-24 11:59:45 sandervl Exp $ */
+/* $Id: hmmmap.cpp,v 1.20 2002-05-20 13:47:58 sandervl Exp $ */
 
 /*
@@ -51 +51 @@
 //******************************************************************************
 DWORD HMDeviceMemMapClass::CreateFileMapping(PHMHANDLEDATA         pHMHandleData,
-                                             HFILE hFile, 
+                                             HFILE hFile,
                                              SECURITY_ATTRIBUTES *sa, /* [in] Optional security attributes*/
                                              DWORD protect,   /* [in] Protection for mapping object */
                                              DWORD size_high, /* [in] High-order 32 bits of object size */
                                              DWORD size_low,  /* [in] Low-order 32 bits of object size */
-                                             LPCSTR name)     /* [in] Name of file-mapping object */ 
+                                             LPCSTR name)     /* [in] Name of file-mapping object */
 {
  Win32MemMap *map;
@@ -64 +64 @@
      (protect & (PAGE_READONLY|PAGE_READWRITE|PAGE_WRITECOPY)) == 0 ||
 //     (hFile == -1 && (protect & SEC_COMMIT)) ||
-     ((protect & SEC_COMMIT) && (protect & SEC_RESERVE))) 
+     ((protect & SEC_COMMIT) && (protect & SEC_RESERVE)))
   {
 
@@ -109 +109 @@
                 dprintf(("CreateFileMappingA: can't create Win32MemMap object!"));
                 return ERROR_OUTOFMEMORY;
-        } 
-
-        if(map->Init() == FALSE) {
+        }
+
+        if(map->Init(size_low) == FALSE) {
                 dprintf(("CreateFileMappingA: init failed!"));
                 delete map;
@@ -177 +177 @@
            dwFileOffsetHigh,
            dwFileOffsetLow,
-           dwNumberOfBytesToMap, 
+           dwNumberOfBytesToMap,
            lpBaseAddress));
 
-  if(lpBaseAddress != NULL) 
+  if(lpBaseAddress != NULL)
   {
 #if 0

trunk/src/kernel32/mmap.cpp

@@ -1 @@
-/* $Id: mmap.cpp,v 1.55 2002-04-07 15:44:11 sandervl Exp $ */
+/* $Id: mmap.cpp,v 1.56 2002-05-20 13:47:59 sandervl Exp $ */
 
 /*
@@ -105 +105 @@
 //******************************************************************************
 //******************************************************************************
-BOOL Win32MemMap::Init()
+BOOL Win32MemMap::Init(DWORD aMSize)
 {
     mapMutex.enter();
@@ -134 +134 @@
             goto fail;
         }
+        if (mSize < aMSize)
+        {
+            dprintf(("Win32MemMap::init: file size %d, memory map size %d", mSize, aMSize));
+            //Froloff: Need to check if exist the possibility of file to memory
+            //         mapping not from the beginning of file
+            mSize = SetFilePointer(hMemFile, aMSize, NULL, FILE_BEGIN);
+            // Commit filesize changes onto disk
+            SetEndOfFile(hMemFile);
+        }
+#if 0
         //SvL: Temporary limitation of size (Warp Server Advanced doesn't allow
         //     one to reserve more than 450 MB (unless you override the virtual
@@ -140 +150 @@
             mSize = 64*1024*1024;
         }
+#endif
     }
 
@@ -611 +622 @@
     //Named file mappings from other processes are always shared;
     //map into our address space
-    if(map->getMemName() != NULL && map->getProcessId() != mProcessId) 
+    if(map->getMemName() != NULL && map->getProcessId() != mProcessId)
     {
         //shared memory map, so map it into our address space
@@ -756 +767 @@
     }
     while(view);
-  
+
     //failure if we get here
     view = NULL;

trunk/src/kernel32/mmap.h

@@ -1 @@
-/* $Id: mmap.h,v 1.21 2002-04-07 15:44:11 sandervl Exp $ */
+/* $Id: mmap.h,v 1.22 2002-05-20 13:47:59 sandervl Exp $ */
 
 /*
@@ -45 +45 @@
   ~Win32MemMap();
 
-   BOOL   Init();
+   BOOL   Init(DWORD aMSize=0);
    BOOL   flushView(ULONG offset, ULONG cbFlush);
    LPVOID mapViewOfFile(ULONG size, ULONG offset, ULONG fdwAccess);