Changeset 2511 for trunk/src/win32k/misc/smalloc_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/smalloc_avl.c (modified) (23 diffs)

trunk/src/win32k/misc/smalloc_avl.c

@@ -1 @@
-/* $Id: smalloc_avl.c,v 1.2 2000-01-24 03:05:14 bird Exp $
+/* $Id: smalloc_avl.c,v 1.3 2000-01-24 18:19:00 bird Exp $
  *
  * Swappable Heap - AVL.
@@ -16 +16 @@
 *   Defined Constants And Macros                                               *
 *******************************************************************************/
+#pragma info(notrd)
 #ifdef DEBUG
     #define DEBUG_ALLOC
-    #define ALLWAYS_HEAPCHECK
-    #define SOMETIMES_HEAPCHECK
+    #undef ALLWAYS_HEAPCHECK
+    #undef SOMETIMES_HEAPCHECK
 #endif
 
@@ -60 +61 @@
 #ifdef RING0
     #include "dev32hlp.h"
-    #include "asmutils.h"
-#else
-    #include <builtin.h>
-    #define Int3() __interrupt(3)
 #endif
+#include "asmutils.h"
 #include "log.h"
 #include "smalloc.h"
 #include "rmalloc.h"
-#include <memory.h>
 #include "dev32.h"
 #include "avl.h"
 #include "macros.h"
+#include <memory.h>
 
 
@@ -162 +160 @@
 static PMEMBLOCK    swpFindUsedBlock(PHEAPANCHOR *ppha, void *pvUser);
 static PMEMBLOCK    swpFindWithinUsedBlock(PHEAPANCHOR *ppha, void *pvUser);
+#ifdef DEBUG_ALLOC
 static int          swpCheckAVLTree(PMEMBLOCK pmb);
 static int          swpCheckAVLTreeFree(PAVLNODECORE pNode);
+#endif
 static unsigned     _swp_dump_subheaps_callback(PMEMBLOCK pmb, PSUBHEAPS_CALLBACK_PARAM pCb);
 static unsigned     _swp_dump_allocated_callback(PMEMBLOCK pmb, PALLOCATED_CALLBACK_PARAM pParam);
@@ -185 +185 @@
 
     unsigned long *pul;
-    unsigned long  ul;
     int            i = 0;
     PMEMBLOCKCHUNK pmcLast = NULL;
@@ -222 +221 @@
     while (pmc->achBitmap[i/8] & (0x1 << (i%8)))
         i++;
-    pmc->achBitmap[i/8] |=  0x1 << (i%8);
+    pmc->achBitmap[i/8] |=  (0x1 << (i%8));
     return &pmc->amb[i];
     #endif
@@ -251 +250 @@
         {
             kprintf(("swpReleaseMemblock: the memblock requested to be freed are allread free!\n"));
-            pmc->cFree++;
+            pmc->cFree--;
         }
         #endif
-        pmc->cFree--;
-        pmc->achBitmap[i / 8] &= pmc->achBitmap[i / 8] & ~(0x1 << i % 8);
-        #endif
+        pmc->cFree++;
+        pmc->achBitmap[i / 8] &= pmc->achBitmap[i / 8] & ~(0x1 << (i % 8));
     }
     else
         kprintf(("swpReleaseMemblock: hmm pmb is not found within any pmc.\n"));
+    #endif
 }
 
@@ -368 +367 @@
     PMEMBLOCK   pmbRightParent;
     PMEMBLOCK   pmbLeft;
-    PMEMBLOCK   pmbTmp;
 
     pha->cbFree += pmb->u2.cbSize;
@@ -753 +751 @@
                     }
                 #endif
-                #ifdef RING3
-                    fInited = TRUE;
+                #ifndef RING0
+                    fSwpInited = TRUE;
                 #endif
 
@@ -920 +918 @@
                 if (pvRet != NULL)
                 {
-                    memcpy(pvRet, pv, pmb->u2.cbSize);
+                    memcpy(pvRet, pv, pmb->u2.cbSize-CB_SIGNATURES);
                     sfree(pv);
                 }
@@ -1005 +1003 @@
 int _swp_validptr(void *pv)
 {
-    PHEAPANCHOR pha;
     PMEMBLOCK   pmb;
 
@@ -1029 +1026 @@
 int _swp_validptr2(void *pv, unsigned cbSize)
 {
-    PHEAPANCHOR pha;
     PMEMBLOCK   pmb;
 
@@ -1090 +1086 @@
         AVLENUMDATA FreeEnumData;
         AVLENUMDATA UsedEnumData;
-        PMEMBLOCK pmbFree = (PMEMBLOCK)AVLBeginEnumTree(&pha->pcoreFree, &FreeEnumData, TRUE);
-        PMEMBLOCK pmbFreeNext = (PMEMBLOCK)AVLGetNextNode(&FreeEnumData);
-        PMEMBLOCK pmbUsed = (PMEMBLOCK)AVLBeginEnumTree(&pha->pcoreUsed, &UsedEnumData, TRUE);
-        PMEMBLOCK pmbUsedNext = (PMEMBLOCK)AVLGetNextNode(&UsedEnumData);
+        PMEMBLOCK pmbFree = (PMEMBLOCK)AVLBeginEnumTree(&pha->pcoreFree,
+                                                        (PAVLENUMDATA)SSToDS(&FreeEnumData), TRUE);
+        PMEMBLOCK pmbFreeNext = (PMEMBLOCK)AVLGetNextNode((PAVLENUMDATA)SSToDS(&FreeEnumData));
+        PMEMBLOCK pmbUsed = (PMEMBLOCK)AVLBeginEnumTree(&pha->pcoreUsed,
+                                                        (PAVLENUMDATA)SSToDS(&UsedEnumData), TRUE);
+        PMEMBLOCK pmbUsedNext = (PMEMBLOCK)AVLGetNextNode((PAVLENUMDATA)SSToDS(&UsedEnumData));
         PMEMBLOCK pmbLast = NULL;
         unsigned  cbFree = 0;
@@ -1204 +1202 @@
                 pmbLast = pmbUsed;
                 pmbUsed = pmbUsedNext;
-                pmbUsedNext = (PMEMBLOCK)AVLGetNextNode(&UsedEnumData);
+                pmbUsedNext = (PMEMBLOCK)AVLGetNextNode((PAVLENUMDATA)SSToDS(&UsedEnumData));
             }
             else
@@ -1244 +1242 @@
                 pmbLast = pmbFree;
                 pmbFree = pmbFreeNext;
-                pmbFreeNext = (PMEMBLOCK)AVLGetNextNode(&FreeEnumData);
+                pmbFreeNext = (PMEMBLOCK)AVLGetNextNode((PAVLENUMDATA)SSToDS(&FreeEnumData));
             }
         }
@@ -1305 +1303 @@
 }
 
-
+#ifdef DEBUG_ALLOC
 /**
  * Check the integrity of the a Free/Used AVL tree where Key == node pointer.
@@ -1316 +1314 @@
     {
         kprintf(("swpCheckAVLTree: Invalid Key!\n"));
+        Int3();
+        return -1;
+    }
+    if (pmb->u1.uData % ALIGNMENT != 0)
+    {
+        kprintf(("swpCheckAVLTree: Data is not correctly aligned, uData=0x%08x\n", pmb->u1.uData));
         Int3();
         return -1;
@@ -1399 +1403 @@
     return 0;
 }
+#endif
 
 
@@ -1406 +1411 @@
 void _swp_heapmin(void)
 {
+    PMEMBLOCKCHUNK pmcLast;
+    PMEMBLOCKCHUNK pmc;
     PHEAPANCHOR pha = phaLast;
 
@@ -1438 +1445 @@
             pha = pha->pPrev;
     }
+
+    pmcLast = NULL;
+    pmc = pmcFirst;
+    while (pmc != NULL)
+    {
+        #ifdef DEBUG_ALLOC
+        if (pmc->cFree > MEMBLOCKS_PER_CHUNK)
+        {
+            kprintf(("_swp_heapmin: internal heap error - pmc->cFree(%d) > MEMBLOCKS_PER_CHUNK(%d)\n",
+                     pmc->cFree, MEMBLOCKS_PER_CHUNK));
+        }
+        #endif
+        if (pmc->cFree == MEMBLOCKS_PER_CHUNK && pmcLast != NULL)
+        {
+            pmcLast->pNext = pmc->pNext;
+            rfree(pmc);
+            pmc = pmcLast->pNext;
+        }
+        else
+        {
+            pmcLast = pmc;
+            pmc = pmc->pNext;
+        }
+    }
 }
 
@@ -1466 +1497 @@
     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(&pha->pcoreUsed, 1,
-                     (PAVLCALLBACK)_swp_dump_subheaps_callback, &UsedParam);
+                     (PAVLCALLBACK)_swp_dump_subheaps_callback, SSToDS(&UsedParam));
         AVLDoWithAll(&pha->pcoreFree, 1,
-                     (PAVLCALLBACK)_swp_dump_subheaps_callback, &FreeParam);
+                     (PAVLCALLBACK)_swp_dump_subheaps_callback, SSToDS(&FreeParam));
 
         kprintf(("HeapAnchor %2d addr=0x%08x cbSize=%6d cbFree=%6d cbUsed=%6d cUsed=%4d cFree=%d\n",
@@ -1515 +1545 @@
 {
     PHEAPANCHOR pha;
-    ALLOCATED_CALLBACK_PARAM Param = {0};
+    ALLOCATED_CALLBACK_PARAM Param = {cb, 0, 0};
 
     kprintf(("----------------------------\n"
@@ -1526 +1556 @@
         /* iterate thru tree using callback */
         AVLDoWithAll((PPAVLNODECORE)&pha->pcoreUsed, TRUE,
-                     (PAVLCALLBACK)_swp_dump_allocated_callback, &Param);
+                     (PAVLCALLBACK)_swp_dump_allocated_callback, SSToDS(&Param));
 
         /* next */