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

Timestamp:

Oct 12, 2001, 5:48:06 AM (24 years ago)

Author:

phaller

Message:

heap acceleration

File:

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

trunk/src/kernel32/os2heap.cpp

@@ -1 @@
-/* $Id: os2heap.cpp,v 1.26 2001-10-09 20:25:20 sandervl Exp $ */
+/* $Id: os2heap.cpp,v 1.27 2001-10-12 03:48:06 phaller Exp $ */
 
 /*
@@ -45 +45 @@
 void   _LNK_CONV releaseHeapMem(Heap_t pHeap, void *block, size_t size);
 
+
+//******************************************************************************
+// Fast Heap Handle Management
+//******************************************************************************
+
+static HANDLE   fhhm_lastHandle = 0;
+static OS2Heap* fhhm_lastHeap   = NULL;
+
+
 //******************************************************************************
 //******************************************************************************
 OS2Heap::OS2Heap(DWORD flOptions, DWORD dwInitialSize, DWORD dwMaximumSize)
 {
- OS2Heap *curheap = OS2Heap::heap;
-
+  OS2Heap *curheap = OS2Heap::heap;
+  
   totalAlloc   = 0;
   fInitialized = 0;
@@ -98 +107 @@
  OS2Heap *curheap = OS2Heap::heap;
  int i;
-
+  
+  // invalidate handle cache
+  fhhm_lastHandle = 0;
+  fhhm_lastHeap   = NULL;
+  
+  
   dprintf(("dtr OS2Heap, hPrimaryHeap = %X\n", hPrimaryHeap));
 
@@ -291 +305 @@
 OS2Heap *OS2Heap::find(HANDLE hHeap)
 {
+  // check against cache first
+  if (fhhm_lastHeap)
+    if (hHeap == fhhm_lastHandle)
+      return fhhm_lastHeap;
+  
   OS2Heap *curheap = OS2Heap::heap;
-
+  
   //@@@PH NT programs seem to assume heap 0 is always valid?!
   if (hHeap == 0)
-     if (curheap != NULL)
-       return curheap;
-
-  while(curheap != NULL) {
-        if(curheap->hPrimaryHeap == hHeap) {
-                return(curheap);
-        }
-        curheap = curheap->next;
+    if (curheap != NULL)
+    {
+      fhhm_lastHandle = hHeap;
+      fhhm_lastHeap   = curheap;
+      return curheap;
+    }
+
+  while(curheap != NULL) 
+  {
+    if(curheap->hPrimaryHeap == hHeap) 
+    {
+      fhhm_lastHandle = hHeap;
+      fhhm_lastHeap   = curheap;
+      return(curheap);
+    }
+    curheap = curheap->next;
   }
   dprintf(("Heap %X not found!\n", hHeap));
+  fhhm_lastHandle = hHeap;
+  fhhm_lastHeap   = NULL;
   return(NULL);
 }