[ros-diffs] [fireball] 50773: [RTL/DPH] - Various fixes: set NodeToAllocate member of the heap root so it could be used lated in AVL allocation routine, initialize the AvailableAllocation list. - Comment out b...

Author: fireball
Date: Thu Feb 17 22:29:49 2011
New Revision: 50773

URL: http://svn.reactos.org/svn/reactos?rev=50773&view=rev
Log:
[RTL/DPH]
- Various fixes: set NodeToAllocate member of the heap root so it could be used lated in
AVL allocation routine, initialize the AvailableAllocation list.
- Comment out biased pointer checks for now, and fix biasing the AdjacencyEntry pointer
(spotted by rafalh).

Modified:
    trunk/reactos/lib/rtl/heappage.c

Modified: trunk/reactos/lib/rtl/heappage.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/heappage.c?rev=507…
==============================================================================
--- trunk/reactos/lib/rtl/heappage.c [iso-8859-1] (original)
+++ trunk/reactos/lib/rtl/heappage.c [iso-8859-1] Thu Feb 17 22:29:49 2011
@@ -434,6 +434,7 @@
     PVOID AddressUserData;
 
     /* Add it to the AVL busy nodes table */
+    DphRoot->NodeToAllocate = DphNode;
     AddressUserData = RtlInsertElementGenericTableAvl(&DphRoot->BusyNodesTable,
                                                       &DphNode->pUserAllocation,
                                                       sizeof(ULONG_PTR),
@@ -518,8 +519,8 @@
                                PDPH_HEAP_BLOCK Node)
 {
     /* Make sure Adjacency list pointers are biased */
-    ASSERT(IS_BIASED_POINTER(Node->AdjacencyEntry.Flink));
-    ASSERT(IS_BIASED_POINTER(Node->AdjacencyEntry.Blink));
+    //ASSERT(IS_BIASED_POINTER(Node->AdjacencyEntry.Flink));
+    //ASSERT(IS_BIASED_POINTER(Node->AdjacencyEntry.Blink));
 
     /* Remove it from the list */
     RemoveEntryList(&Node->AvailableEntry);
@@ -529,8 +530,8 @@
     DphRoot->nAvailableAllocationBytesCommitted -= Node->nVirtualBlockSize;
 
     /* Remove bias from the AdjacencyEntry pointer */
-    POINTER_REMOVE_BIAS(Node->AdjacencyEntry.Flink);
-    POINTER_REMOVE_BIAS(Node->AdjacencyEntry.Blink);
+    Node->AdjacencyEntry.Flink =
(PLIST_ENTRY)POINTER_REMOVE_BIAS(Node->AdjacencyEntry.Flink);
+    Node->AdjacencyEntry.Blink =
(PLIST_ENTRY)POINTER_REMOVE_BIAS(Node->AdjacencyEntry.Blink);
 }
 
 VOID NTAPI
@@ -720,8 +721,8 @@
     }
 
     /* Make sure Adjacency list pointers are biased */
-    ASSERT(IS_BIASED_POINTER(Node->AdjacencyEntry.Flink));
-    ASSERT(IS_BIASED_POINTER(Node->AdjacencyEntry.Blink));
+    //ASSERT(IS_BIASED_POINTER(Node->AdjacencyEntry.Flink));
+    //ASSERT(IS_BIASED_POINTER(Node->AdjacencyEntry.Blink));
 
     return Node;
 }
@@ -997,7 +998,6 @@
     /* Get pointer to the containing heap root record */
     DphRoot = CONTAINING_RECORD(Table, DPH_HEAP_ROOT, BusyNodesTable);
     pBlock = DphRoot->NodeToAllocate;
-    ASSERT(pBlock == (PDPH_HEAP_BLOCK)(Table+1)); // FIXME: Delete once confirmed
 
     DphRoot->NodeToAllocate = NULL;
     ASSERT(pBlock);
@@ -1348,6 +1348,7 @@
     DphRoot->Seed = PerfCounter.LowPart;
 
     RtlInitializeCriticalSection(DphRoot->HeapCritSect);
+    InitializeListHead(&DphRoot->AvailableAllocationHead);
 
     /* Create a normal heap for this paged heap */
     DphRoot->NormalHeap = RtlCreateHeap(Flags, NULL, TotalSize, CommitSize, NULL,
(PRTL_HEAP_PARAMETERS)-1);