Changeset 7360 for trunk/src/kernel32/os2heap.cpp

Timestamp:

Nov 16, 2001, 3:52:56 PM (24 years ago)

Author:

phaller

Message:

slightly more tuning

File:

• trunk/src/kernel32/os2heap.cpp (modified) (8 diffs)

trunk/src/kernel32/os2heap.cpp

@@ -1 @@
-/* $Id: os2heap.cpp,v 1.30 2001-11-16 12:57:00 phaller Exp $ */
+/* $Id: os2heap.cpp,v 1.31 2001-11-16 14:52:55 phaller Exp $ */
 
 /*
@@ -40 +40 @@
 #endif
 
-VMutex heaplistmutex;   //protects linked lists of heaps
-
 void * _LNK_CONV getmoreHeapMem(Heap_t pHeap, size_t *size, int *clean);
 void   _LNK_CONV releaseHeapMem(Heap_t pHeap, void *block, size_t size);
 
+VMutex heaplistmutex;   //protects linked lists of heaps
+
 
 //******************************************************************************
@@ -60 +60 @@
   OS2Heap *curheap = OS2Heap::heap;
   
+#ifdef DEBUG
   totalAlloc   = 0;
+#endif
   fInitialized = 0;
   nrHeaps      = 0;
@@ -158 +160 @@
       memset(lpMem, 0, dwBytes+HEAP_OVERHEAD);
   }
+  
+#ifdef DEBUG
   totalAlloc += dwBytes;
-
+#endif
+  
   //align at 8 byte boundary
   lpHeapObj = (HEAPELEM *)(((ULONG)lpMem+7) & ~7);
@@ -251 +256 @@
   int size = Size(0, lpMem);
   dprintf(("OS2Heap::Free lpMem = %X, size %d\n", lpMem, size));
+#ifdef DEBUG
   totalAlloc -= size;
+#endif
 #endif
 
@@ -272 +279 @@
   dprintf(("OS2Heap::Validate, %X %X", dwFlags, lpMem));
 
-  if(lpMem == NULL) {
-        dprintf(("OS2Heap::Validate lpMem == NULL\n"));
-        return(FALSE);
-  }
   /* verify lpMem address */
   if (lpMem >= (LPVOID)ulMaxAddr || lpMem < (LPVOID)0x10000)
@@ -341 +344 @@
 OS2Heap *OS2Heap::heap = NULL;
 
+
 //******************************************************************************
 //******************************************************************************
@@ -353 +357 @@
   //NOTE: MUST use 64kb here or else we are at risk of running out of virtual
   //      memory space. (when allocating 4kb we actually get 4kb + 60k uncommited)
-  *size = (*size / 65536) * 65536 + 65536;
+  *size = ( (*size / 65536) + 1) * 65536;
 
   rc = DosAllocMem(&newblock, *size, PAG_READ|PAG_WRITE|PAG_COMMIT|PAG_EXECUTE);