Changeset 2511 for trunk/src/win32k/misc/rmalloc_avl.c

Timestamp:

Jan 24, 2000, 7:19:01 PM (26 years ago)

Author:

bird

Message:

Heapchanges: Heap is splitted into a swappable and a resident. The heaps
are dynamically growable.

File:

• trunk/src/win32k/misc/rmalloc_avl.c (modified) (24 diffs)

trunk/src/win32k/misc/rmalloc_avl.c

@@ -1 @@
-/* $Id: rmalloc_avl.c,v 1.4 2000-01-24 03:05:14 bird Exp $
+/* $Id: rmalloc_avl.c,v 1.5 2000-01-24 18:19:00 bird Exp $
  *
  * Resident Heap - AVL.
@@ -16 +16 @@
 *   Defined Constants And Macros                                               *
 *******************************************************************************/
+#pragma info(notrd)
 #ifdef DEBUG
     #define DEBUG_ALLOC
-    #define ALLWAYS_HEAPCHECK
+    #undef ALLWAYS_HEAPCHECK
+    #undef SOMETIMES_HEAPCHECK
 #endif
 
@@ -41 +43 @@
 #endif
 
-
 /******************************************************************************
 *  Headerfiles
@@ -48 +49 @@
 #ifdef RING0
     #include "dev32hlp.h"
-    #include "asmutils.h"
-#else
-    #include <builtin.h>
-    #define Int3() __interrupt(3)
 #endif
+#include "asmutils.h"
 #include "log.h"
 #include "rmalloc.h"
-#include <memory.h>
 #include "dev32.h"
 #include "avl.h"
 #include "macros.h"
+#include <memory.h>
 
 
@@ -139 +137 @@
 static PMEMBLOCK    resFindUsedBlock(PHEAPANCHOR *ppha, void *pvUser);
 static PMEMBLOCK    resFindWithinUsedBlock(PHEAPANCHOR *ppha, void *pvUser);
+#ifdef DEBUG_ALLOC
 static int          resCheckAVLTree(PMEMBLOCK pmb);
 static int          resCheckAVLTreeFree(PAVLNODECORE pNode);
+#endif
 static unsigned     _res_dump_subheaps_callback(PMEMBLOCK pmb, PSUBHEAPS_CALLBACK_PARAM pCb);
 static unsigned     _res_dump_allocated_callback(PMEMBLOCK pmb, PALLOCATED_CALLBACK_PARAM pParam);
@@ -252 +252 @@
     PMEMBLOCKFREE   pmbfRightParent;
     PMEMBLOCKFREE   pmbfLeft;
-    PMEMBLOCKFREE   pmbfTmp;
 
     pha->cbFree += pmb->cbSize;
@@ -592 +591 @@
     resInsertFree(phaFirst, pmb);
 
-    #ifdef ALLWAYS_HEAPCHECK
+    #if defined(ALLWAYS_HEAPCHECK) || defined(SOMETIMES_HEAPCHECK)
         if (!_res_heap_check())
         {   /* error! */
@@ -602 +601 @@
         }
     #endif
-    #ifdef RING3
-        fInited = TRUE;
+    #ifndef RING0
+        fResInited = TRUE;
     #endif
     return 0;
@@ -618 +617 @@
 void * rmalloc(unsigned cbSize)
 {
-    #ifdef ALLWAYS_HEAPCHECK
+    #if defined(ALLWAYS_HEAPCHECK) || defined(SOMETIMES_HEAPCHECK)
     if (!_res_heap_check())
     {
@@ -655 +654 @@
     PHEAPANCHOR pha;
 
-    #ifdef ALLWAYS_HEAPCHECK
+    #if defined(ALLWAYS_HEAPCHECK) || defined(SOMETIMES_HEAPCHECK)
     if (!_res_heap_check())
     {
@@ -778 +777 @@
 void rfree(void *pv)
 {
-    #ifdef ALLWAYS_HEAPCHECK
-        if (!_res_heap_check())
-        {
-            kprintf(("rfree: _res_heap_check failed!\n"));
-            return;
-        }
+    #if defined(ALLWAYS_HEAPCHECK) || defined(SOMETIMES_HEAPCHECK)
+    if (!_res_heap_check())
+    {
+        kprintf(("rfree: _res_heap_check failed!\n"));
+        return;
+    }
     #endif
 
@@ -825 +824 @@
 
     #ifdef ALLWAYS_HEAPCHECK
-        if (!_res_heap_check())
-            kprintf(("_res_msize: _res_heap_check failed!\n"));
+    if (!_res_heap_check())
+        kprintf(("_res_msize: _res_heap_check failed!\n"));
     #endif
 
@@ -841 +840 @@
 int _res_validptr(void *pv)
 {
-    PHEAPANCHOR pha;
     PMEMBLOCK   pmb;
 
     #ifdef ALLWAYS_HEAPCHECK
-        if (!_res_heap_check())
-            kprintf(("_res_validptr: _res_heap_check failed!\n"));
+    if (!_res_heap_check())
+        kprintf(("_res_validptr: _res_heap_check failed!\n"));
     #endif
 
@@ -862 +860 @@
 int _res_validptr2(void *pv, unsigned cbSize)
 {
-    PHEAPANCHOR pha;
     PMEMBLOCK   pmb;
 
     #ifdef ALLWAYS_HEAPCHECK
-        if (!_res_heap_check())
-            kprintf(("_res_validptr: _res_heap_check failed!\n"));
+    if (!_res_heap_check())
+        kprintf(("_res_validptr: _res_heap_check failed!\n"));
     #endif
 
@@ -889 +886 @@
 
     #ifdef ALLWAYS_HEAPCHECK
-        if (!_res_heap_check())
-            kprintf(("_res_memfree: _res_heap_check failed!\n"));
+    if (!_res_heap_check())
+        kprintf(("_res_memfree: _res_heap_check failed!\n"));
     #endif
 
@@ -917 +914 @@
         AVLENUMDATA FreeEnumData;
         AVLENUMDATA UsedEnumData;
-        PMEMBLOCK pmbFree = (PMEMBLOCK)AVLBeginEnumTree((PPAVLNODECORE)&pha->pmbFree, &FreeEnumData, TRUE);
-        PMEMBLOCK pmbFreeNext = (PMEMBLOCK)AVLGetNextNode(&FreeEnumData);
-        PMEMBLOCK pmbUsed = (PMEMBLOCK)AVLBeginEnumTree((PPAVLNODECORE)&pha->pmbUsed, &UsedEnumData, TRUE);
-        PMEMBLOCK pmbUsedNext = (PMEMBLOCK)AVLGetNextNode(&UsedEnumData);
+        PMEMBLOCK pmbFree = (PMEMBLOCK)AVLBeginEnumTree((PPAVLNODECORE)&pha->pmbFree,
+                                                        SSToDS(&FreeEnumData), TRUE);
+        PMEMBLOCK pmbFreeNext = (PMEMBLOCK)AVLGetNextNode(SSToDS(&FreeEnumData));
+        PMEMBLOCK pmbUsed = (PMEMBLOCK)AVLBeginEnumTree((PPAVLNODECORE)&pha->pmbUsed,
+                                                        SSToDS(&UsedEnumData), TRUE);
+        PMEMBLOCK pmbUsedNext = (PMEMBLOCK)AVLGetNextNode(SSToDS(&UsedEnumData));
         PMEMBLOCK pmbLast = NULL;
         unsigned  cbFree = 0;
@@ -1031 +1030 @@
                 pmbLast = pmbUsed;
                 pmbUsed = pmbUsedNext;
-                pmbUsedNext = (PMEMBLOCK)AVLGetNextNode(&UsedEnumData);
+                pmbUsedNext = (PMEMBLOCK)AVLGetNextNode(SSToDS(&UsedEnumData));
             }
             else
@@ -1071 +1070 @@
                 pmbLast = pmbFree;
                 pmbFree = pmbFreeNext;
-                pmbFreeNext = (PMEMBLOCK)AVLGetNextNode(&FreeEnumData);
+                pmbFreeNext = (PMEMBLOCK)AVLGetNextNode(SSToDS(&FreeEnumData));
             }
         }
@@ -1133 +1132 @@
 
 
+#ifdef DEBUG_ALLOC
 /**
  * Check the integrity of the a Free/Used AVL tree where Key == node pointer.
@@ -1143 +1143 @@
     {
         kprintf(("resCheckAVLTree: Invalid Key!\n"));
+        Int3();
+        return -1;
+    }
+    if (pmb->core.Key % ALIGNMENT != 0)
+    {
+        kprintf(("resCheckAVLTree: Data is not correctly aligned, uData=0x%08x\n", pmb->core.Key));
         Int3();
         return -1;
@@ -1223 +1229 @@
     return 0;
 }
+#endif
 
 
@@ -1289 +1296 @@
     while (pha != NULL)
     {
-        PMEMBLOCK pmb;
-        SUBHEAPS_CALLBACK_PARAM FreeParam = {0};
-        SUBHEAPS_CALLBACK_PARAM UsedParam = {0};
+        SUBHEAPS_CALLBACK_PARAM FreeParam = {0, 0};
+        SUBHEAPS_CALLBACK_PARAM UsedParam = {0, 0};
 
         AVLDoWithAll((PPAVLNODECORE)&pha->pmbUsed, 1,
-                     (PAVLCALLBACK)_res_dump_subheaps_callback, &UsedParam);
+                     (PAVLCALLBACK)_res_dump_subheaps_callback, SSToDS(&UsedParam));
         AVLDoWithAll((PPAVLNODECORE)&pha->pmbFree, 1,
-                     (PAVLCALLBACK)_res_dump_subheaps_callback, &FreeParam);
+                     (PAVLCALLBACK)_res_dump_subheaps_callback, SSToDS(&FreeParam));
 
         kprintf(("HeapAnchor %2d addr=0x%08x cbSize=%6d cbFree=%6d cbUsed=%6d cUsed=%4d cFree=%d\n",
@@ -1338 +1344 @@
 {
     PHEAPANCHOR pha;
-    ALLOCATED_CALLBACK_PARAM Param = {0};
+    ALLOCATED_CALLBACK_PARAM Param = {cb, 0, 0};
 
     kprintf(("----------------------------\n"
@@ -1349 +1355 @@
         /* iterate thru tree using callback */
         AVLDoWithAll((PPAVLNODECORE)&pha->pmbUsed, TRUE,
-                     (PAVLCALLBACK)_res_dump_allocated_callback, &Param);
+                     (PAVLCALLBACK)_res_dump_allocated_callback, SSToDS(&Param));
 
         /* next */