Changeset 7 in kStuff for trunk/include/k/kAvlTmpl/kAvlRemoveBestFit.h

Timestamp:

Feb 4, 2008 2:08:02 AM (17 years ago)

Author:

bird

Message:

kAVL: Implemented locking, root node and a direct cache.

File:

• trunk/include/k/kAvlTmpl/kAvlRemoveBestFit.h (modified) (3 diffs)

trunk/include/k/kAvlTmpl/kAvlRemoveBestFit.h

@@ -37 +37 @@
  *
  * @returns Pointer to the removed node.
- * @param   ppTree      Pointer to Pointer to the tree root node.
+ * @param   pRoot       Pointer to the AVL-tree root structure.
  * @param   Key         The Key of which is to be found a best fitting match for..
  * @param   fAbove      K_TRUE:  Returned node is have the closest key to Key from above.
@@ -46 +46 @@
  *          code size, and the likelyhood for bugs.
  */
-KAVL_DECL(KAVLNODE *) KAVL_FN(RemoveBestFit)(KAVLTREEPTR *ppTree, KAVLKEY Key, KBOOL fAbove)
+KAVL_DECL(KAVLNODE *) KAVL_FN(RemoveBestFit)(KAVLROOT *pRoot, KAVLKEY Key, KBOOL fAbove)
 {
     /*
@@ -53 +53 @@
      * removing the in-tree node as this is way cheaper.
      */
-    KAVLNODE *pNode = KAVL_FN(GetBestFit)(ppTree, Key, fAbove);
+    KAVLNODE *pNode = KAVL_FN(GetBestFit)(pRoot, Key, fAbove);
     if (pNode != NULL)
     {
 #ifdef KAVL_EQUAL_ALLOWED
+        KAVL_WRITE_LOCK(pRoot); /** @todo the locking isn't quite sane here. :-/ */
         if (pNode->mpList != KAVL_NULL)
         {
             KAVLNODE *pRet = KAVL_GET_POINTER(&pNode->mpList);
             KAVL_SET_POINTER_NULL(&pNode->mpList, &pRet->mpList);
+            KAVL_LOOKTHRU_INVALIDATE_NODE(pRoot, pNode, pNode->mKey);
+            KAVL_WRITE_UNLOCK(pRoot);
             return pRet;
         }
+        KAVL_WRITE_UNLOCK(pRoot);
 #endif
-        pNode = KAVL_FN(Remove)(ppTree, pNode->mKey);
+        pNode = KAVL_FN(Remove)(pRoot, pNode->mKey);
     }
     return pNode;