Changeset 6954 for trunk/src

Timestamp:

Oct 6, 2001, 8:53:11 PM (24 years ago)

Author:

sandervl

Message:

reduce heap overhead + always allocate from high memory

Location:

trunk/src/kernel32

Files:

• os2heap.cpp (modified) (7 diffs)
• os2heap.h (modified) (3 diffs)

trunk/src/kernel32/os2heap.cpp

@@ -1 @@
-/* $Id: os2heap.cpp,v 1.23 2001-07-30 12:01:24 sandervl Exp $ */
+/* $Id: os2heap.cpp,v 1.24 2001-10-06 18:53:11 sandervl Exp $ */
 
 /*
@@ -43 +43 @@
 
 void * _LNK_CONV getmoreHeapMem(Heap_t pHeap, size_t *size, int *clean);
-void _LNK_CONV   releaseHeapMem(Heap_t pHeap, void *block, size_t size);
+void   _LNK_CONV releaseHeapMem(Heap_t pHeap, void *block, size_t size);
 
 //******************************************************************************
@@ -61 +61 @@
   this->dwInitialSize = dwInitialSize;
   this->flOptions     = flOptions;
-
-  if(!(flOptions & HEAP_NO_SERIALIZE))
-  {
-    hmutex = new VMutex();
-    dassert(hmutex, ("ERROR: new VMutex\n"));
-  }
-  else  hmutex = NULL;
 
   heaplistmutex.enter();
@@ -104 +97 @@
 {
  OS2Heap *curheap = OS2Heap::heap;
- HEAPELEM *hnext;
  int i;
 
   dprintf(("dtr OS2Heap, hPrimaryHeap = %X\n", hPrimaryHeap));
-
-  if(hmutex)
-    hmutex->enter();
-
-  while(heapelem) {
-    hnext = heapelem->next;
-    free(heapelem->lpMem);
-    heapelem = hnext;
-  }
-  if(hmutex)
-  {
-    hmutex->leave();
-    delete(hmutex);
-  }
 
   heaplistmutex.enter();
@@ -171 +149 @@
   lpHeapObj = (HEAPELEM *)(((ULONG)lpMem+7) & ~7);
   lpHeapObj->lpMem = lpMem;
-
-  if(hmutex)
-      hmutex->enter();
-
-  lpHeapObj->next    = heapelem;
-  lpHeapObj->prev    = NULL;
   lpHeapObj->magic   = MAGIC_NR_HEAP;
-  if(heapelem) {
-      heapelem->prev = lpHeapObj;
-  }
-  heapelem           = lpHeapObj;
-
-  if(hmutex) {
-      hmutex->leave();
-  }
+
   return(LPVOID)(lpHeapObj+1);
 }
@@ -278 +243 @@
   totalAlloc -= size;
 #endif
-  if(hmutex)
-    hmutex->enter();
-
-  if(helem->prev)
-        helem->prev->next = helem->next;
-  if(helem->next)
-        helem->next->prev = helem->prev;
-  if(heapelem == helem)
-        heapelem = heapelem->next;
-
-  if(hmutex) {
-        hmutex->leave();
-  }
 
   free(helem->lpMem);
@@ -371 +323 @@
   *size = (*size / 4096) * 4096 + 4096;
 
-  rc = DosAllocMem(&newblock, *size, PAG_READ|PAG_WRITE|PAG_COMMIT|PAG_EXECUTE);
+  rc = DosAllocMem(&newblock, *size, flAllocMem|PAG_READ|PAG_WRITE|PAG_COMMIT|PAG_EXECUTE);
   if(rc != 0) {
         dprintf(("getmoreHeapMem: DosAllocMem failed with %d", rc));
         return FALSE;
   }
+success:
   *clean = _BLOCK_CLEAN;
   dprintf(("KERNEL32: getmoreHeapMem %x %d", newblock, *size));

trunk/src/kernel32/os2heap.h

@@ -1 @@
-/* $Id: os2heap.h,v 1.7 2001-07-28 18:03:38 sandervl Exp $ */
+/* $Id: os2heap.h,v 1.8 2001-10-06 18:53:11 sandervl Exp $ */
 
 /*
@@ -23 +23 @@
   DWORD  magic;     //magic number
   LPVOID lpMem;     //pointer returned by malloc
-  struct _tagHEAPELEM *prev;
-  struct _tagHEAPELEM *next;
 } HEAPELEM;
 
-//extra overhead needed for quake 2 or 3 (a long time ago...)
-//#define HEAP_OVERHEAD (sizeof(HEAPELEM)+60)
 //+8 to make sure we can align the pointer at 8 byte boundary
 #define HEAP_OVERHEAD (sizeof(HEAPELEM)+8)
@@ -55 +51 @@
 protected:
 
-    VMutex *hmutex;
-
     DWORD     dwMaximumSize, dwInitialSize, flOptions, totalAlloc, nrHeaps;
     HANDLE    hPrimaryHeap;