Author: tkreuzer
Date: Tue Mar 27 21:41:39 2012
New Revision: 56253
URL: http://svn.reactos.org/svn/reactos?rev=56253&view=rev
Log:
[RTL]
Remove pointless ASSERTs, instead set the balance of the new node to balanced,
before inserting it.
Dedicated to Alex.
Modified:
trunk/reactos/lib/rtl/avlsupp.c
Modified: trunk/reactos/lib/rtl/avlsupp.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/avlsupp.c?rev=56253&r1=56252&r2=56253&view=diff
==============================================================================
--- trunk/reactos/lib/rtl/avlsupp.c [iso-8859-1] (original)
+++ trunk/reactos/lib/rtl/avlsupp.c [iso-8859-1] Tue Mar 27 21:41:39 2012
@@ -203,45 +203,6 @@
return TRUE;
}
-#ifdef PRTL_BALANCED_LINKS
-void
-Indent(ULONG Level)
-{
- while (Level--)
- {
- DbgPrint(" ");
- }
-}
-
-VOID
-DbgDumpAvlNodes(
- PRTL_BALANCED_LINKS Node,
- ULONG Level)
-{
- if (Level == 0)
- {
- DbgPrint("++++++++++++++++++++++++++++++++++++++++++++++++++++++\n");
- DbgPrint("Root = %p\n", Node);
- }
-
- Indent(Level+1); DbgPrint("LetChid = %p", Node->LeftChild);
- if (Node->LeftChild)
- {
- DbgPrint("(%lx, %lx)\n",
Node->LeftChild->StartingVpn,Node->LeftChild->EndingVpn);
- DbgDumpAvlNodes(Node->LeftChild, Level+1);
- }
- else DbgPrint("\n");
- Indent(Level+1); DbgPrint("RightChild = %p\n", Node->RightChild);
- if (Node->RightChild)
- {
- DbgPrint("(%lx, %lx)\n",
Node->RightChild->StartingVpn,Node->RightChild->EndingVpn);
- DbgDumpAvlNodes(Node->RightChild, Level+1);
- }
- else DbgPrint("\n");
-}
-#endif
-
-
VOID
FORCEINLINE
RtlpInsertAvlTreeNode(IN PRTL_AVL_TABLE Table,
@@ -254,6 +215,7 @@
/* Initialize the new inserted element */
MI_ASSERT(SearchResult != TableFoundNode);
NewNode->LeftChild = NewNode->RightChild = NULL;
+ RtlSetBalance(NewNode, RtlBalancedAvlTree);
/* Increase element count */
Table->NumberGenericTableElements++;
@@ -263,15 +225,6 @@
{
/* This is the new root node */
RtlInsertAsRightChildAvl(&Table->BalancedRoot, NewNode);
- //MI_ASSERT(RtlBalance(NewNode) == RtlBalancedAvlTree);
- if (RtlBalance(NewNode) != RtlBalancedAvlTree)
- {
- DPRINT1("Warning: Root node unbalanced?\n");
-#ifdef PRTL_BALANCED_LINKS
- DbgDumpAvlNodes(&Table->BalancedRoot, 0);
- KeRosDumpStackFrames(NULL, 0);
-#endif
- }
/* On AVL trees, we also update the depth */
ASSERT(Table->DepthOfTree == 0);
@@ -290,15 +243,6 @@
}
/* Little cheat to save on loop processing, taken from Timo */
- //MI_ASSERT(RtlBalance(NewNode) == RtlBalancedAvlTree);
- if (RtlBalance(NewNode) != RtlBalancedAvlTree)
- {
- DPRINT1("Warning: Root node unbalanced?\n");
-#ifdef PRTL_BALANCED_LINKS
- DbgDumpAvlNodes(&Table->BalancedRoot, 0);
- KeRosDumpStackFrames(NULL, 0);
-#endif
- }
RtlSetBalance(&Table->BalancedRoot, RtlLeftHeavyAvlTree);
/*
