Changeset 7358 for trunk/src

Timestamp:

Nov 16, 2001, 1:57:01 PM (24 years ago)

Author:

phaller

Message:

Heap acceleration

Location:

trunk/src/kernel32

Files:

• heap.cpp (modified) (14 diffs)
• os2heap.cpp (modified) (4 diffs)

trunk/src/kernel32/heap.cpp

@@ -1 @@
-/* $Id: heap.cpp,v 1.39 2001-10-15 17:17:48 sandervl Exp $ */
 
 /*
@@ -32 +31 @@
 OS2Heap *OS2ProcessHeap = NULL;
 
-//******************************************************************************
-//******************************************************************************
-ODINFUNCTIONNODBG3(LPVOID, HeapAlloc, HANDLE, hHeap, DWORD, dwFlags, 
-                   DWORD, dwBytes)
-{
- OS2Heap *curheap = OS2Heap::find(hHeap);
- LPVOID   rc;
+
+
+//******************************************************************************
+// Fast Heap Handle Management
+//******************************************************************************
+
+extern HANDLE   fhhm_lastHandle;
+extern OS2Heap* fhhm_lastHeap;
+
+#define FINDHEAP(curheap, hHeap)     \
+  if (fhhm_lastHeap &&               \
+      hHeap == fhhm_lastHandle)      \
+    curheap = fhhm_lastHeap;         \
+  else                               \
+    curheap = OS2Heap::find(hHeap);  \
+
+
+//******************************************************************************
+//******************************************************************************
+LPVOID WIN32API HeapAlloc(HANDLE hHeap, 
+                          DWORD dwFlags,
+                          DWORD dwBytes)
+{
+  OS2Heap *curheap;
+  FINDHEAP(curheap,hHeap)
+  LPVOID   rc;
 
   if(curheap == NULL)
@@ -49 +67 @@
 //******************************************************************************
 //******************************************************************************
-ODINFUNCTIONNODBG4(LPVOID, HeapReAlloc, HANDLE, hHeap, DWORD, dwFlags, LPVOID, 
-                   lpMem, DWORD, dwBytes)
-{
- OS2Heap *curheap = OS2Heap::find(hHeap);
+LPVOID HeapReAlloc(HANDLE hHeap, 
+                   DWORD dwFlags,
+                   LPVOID lpMem, 
+                   DWORD dwBytes)
+{
+  OS2Heap *curheap;
+  FINDHEAP(curheap,hHeap)
 
   dprintf2(("HeapReAlloc %x %x %x %X bytes", hHeap, dwFlags, lpMem, dwBytes));
@@ -66 +87 @@
 //******************************************************************************
 //******************************************************************************
-ODINFUNCTIONNODBG3(BOOL, HeapFree, HANDLE, hHeap, DWORD, dwFlags, LPVOID, lpMem)
-{
- OS2Heap *curheap = OS2Heap::find(hHeap);
+BOOL WIN32API HeapFree(HANDLE hHeap, 
+                       DWORD dwFlags,
+                       LPVOID lpMem)
+{
+  OS2Heap *curheap;
+  FINDHEAP(curheap,hHeap)
 
   dprintf2(("HeapFree %X", lpMem));
   if(curheap == NULL)
-        return(FALSE);
-
-  return(curheap->Free(dwFlags, lpMem));
+    return(FALSE);
+
+  BOOL fResult = curheap->Free(dwFlags, lpMem);
+  if (fResult == FALSE)
+    SetLastError(ERROR_INVALID_HANDLE); /// @@@PH possibly wrong return code!
+  
+  return fResult;
 }
 //******************************************************************************
@@ -104 +132 @@
 ODINFUNCTIONNODBG1(BOOL, HeapDestroy, HANDLE, hHeap)
 {
- OS2Heap *curheap = OS2Heap::find(hHeap);
+  OS2Heap *curheap;
+  FINDHEAP(curheap,hHeap)
 
   dprintf2(("HeapDestroy %X", hHeap));
@@ -117 +146 @@
 ODINFUNCTIONNODBG3(DWORD, HeapSize, HANDLE, hHeap, DWORD, arg2, PVOID, lpMem)
 {
- OS2Heap *curheap = OS2Heap::find(hHeap);
+  OS2Heap *curheap;
+  FINDHEAP(curheap,hHeap)
 
   dprintf2(("HeapSize %X %x %x", hHeap, arg2, lpMem));
@@ -136 +166 @@
 ODINFUNCTIONNODBG3(BOOL, HeapValidate, HANDLE, hHeap, DWORD, dwFlags, LPCVOID, lpMem)
 {
- OS2Heap *curheap = OS2Heap::find(hHeap);
+  OS2Heap *curheap;
+  FINDHEAP(curheap,hHeap)
 
   dprintf2(("KERNEL32: HeapValidate %x %x %x", hHeap, dwFlags, lpMem));
@@ -168 +199 @@
 //******************************************************************************
 //******************************************************************************
-ODINFUNCTIONNODBG0(HANDLE, GetProcessHeap)
-{
- HANDLE hHeap;
-
+HANDLE WIN32API GetProcessHeap()
+{
 //    dprintf2(("KERNEL32: GetProcessHeap\n"));
     //SvL: Only one process heap per process
@@ -242 +271 @@
    {
       palloc=HeapAlloc(GetProcessHeap(), hpflags, size);
-      dprintf(("KERNEL32: GlobalAlloc %x %d returned %x", flags, size, palloc));
       return (HGLOBAL) palloc;
    }
@@ -270 +298 @@
       /* HeapUnlock(heap); */
        
-      dprintf(("KERNEL32: GlobalAlloc %x %d returned %x", flags, size, INTERN_TO_HANDLE(pintern)));
       return INTERN_TO_HANDLE(pintern);
    }
@@ -477 +504 @@
 
 #ifdef __WIN32OS2__
-   hmem = GlobalHandle((LPCVOID)hmem);
+/* @@@PH 20011017
+  convert a handle to a handle ???
+  hmem = GlobalHandle((LPCVOID)hmem);
+  */
 #endif
 
@@ -581 +611 @@
    PGLOBAL32_INTERN pintern;
    HGLOBAL        hreturned = 0;
-
+  
+  // 2001-10-17 PH
+  // Note: we do have a *HANDLE* here still ...
+  // any may not terminate w/o setting SetLastError()
+  // plus returning 0 means "OK"!
+#if 0
    /* verify lpMem address */
    if (hmem >= (HGLOBAL)ulMaxAddr || hmem < (HGLOBAL)0x10000)
@@ -589 +624 @@
         return 0;
    }
-
+#endif
+  
    if(ISPOINTER(hmem)) /* POINTER */
    {
-      if(!HeapFree(GetProcessHeap(), 0, (LPVOID) hmem)) hmem = 0;
+     if(HeapFree(GetProcessHeap(), 0, (LPVOID) hmem) == TRUE)
+       hreturned = 0;    // success
+     else
+       hreturned = hmem; // failure
    }
    else  /* HANDLE */
@@ -613 +652 @@
             hreturned=hmem;
       }      
+      else
+      {
+        // this was not a heap handle!
+        SetLastError(ERROR_INVALID_HANDLE);
+        hreturned = hmem;
+      }
+     
       /* HeapUnlock(heap); */
    }
+  
    return hreturned;
 }

trunk/src/kernel32/os2heap.cpp

@@ -1 @@
-/* $Id: os2heap.cpp,v 1.29 2001-10-22 23:28:11 phaller Exp $ */
+/* $Id: os2heap.cpp,v 1.30 2001-11-16 12:57:00 phaller Exp $ */
 
 /*
@@ -50 +50 @@
 //******************************************************************************
 
-//static int fhhm_hit = 0;
-//static int fhhm_miss = 0;
-static HANDLE   fhhm_lastHandle = 0;
-static OS2Heap* fhhm_lastHeap   = NULL;
+HANDLE   fhhm_lastHandle = 0;
+OS2Heap* fhhm_lastHeap   = NULL;
 
 
@@ -237 +235 @@
   HEAPELEM *helem = GET_HEAPOBJ(lpMem);
 
-  if(lpMem == NULL) {
-        dprintf(("OS2Heap::Free lpMem == NULL\n"));
-        return(FALSE);
-  }
   /* verify lpMem address */
   if (lpMem >= (LPVOID)ulMaxAddr || lpMem < (LPVOID)0x10000)
@@ -307 +301 @@
 OS2Heap *OS2Heap::find(HANDLE hHeap)
 {
-  // check against cache first
-  if (fhhm_lastHeap)
-    if (hHeap == fhhm_lastHandle)
-    {
-//      fhhm_hit++;
-      return fhhm_lastHeap;
-    }
-  
-//  fhhm_miss++;
-  
+/* PH moved to inlineable macro ...
+ *  // check against cache first
+ * if (fhhm_lastHeap)
+ *   if (hHeap == fhhm_lastHandle)
+ *   {
+ *     return fhhm_lastHeap;
+ *   }
+ *
+ */
+ 
   OS2Heap *curheap = OS2Heap::heap;