Changeset 7 in kStuff for trunk/include/k/kAvlTmpl/kAvlGetBestFit.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/kAvlGetBestFit.h (modified) (6 diffs)

trunk/include/k/kAvlTmpl/kAvlGetBestFit.h

@@ -37 +37 @@
  *
  * @returns Pointer to the best fitting node found.
- * @param   ppTree      Pointer to Pointer to the tree root node.
- * @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.
- *                      K_FALSE: Returned node is have the closest key to Key from below.
+ * @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.
+ *                          K_FALSE: Returned node is have the closest key to Key from below.
  * @sketch  The best fitting node is always located in the searchpath above you.
  *          >= (above): The node where you last turned left.
  *          <= (below): the node where you last turned right.
  */
-KAVL_DECL(KAVLNODE *) KAVL_FN(GetBestFit)(KAVLTREEPTR *ppTree, KAVLKEY Key, KBOOL fAbove)
+KAVL_DECL(KAVLNODE *) KAVL_FN(GetBestFit)(KAVLROOT *pRoot, KAVLKEY Key, KBOOL fAbove)
 {
     register KAVLNODE  *pNode;
     KAVLNODE           *pNodeLast;
 
-    if (*ppTree == KAVL_NULL)
+    KAVL_READ_LOCK(pLook);
+    if (pRoot->mpRoot == KAVL_NULL)
+    {
+        KAVL_READ_UNLOCK(pLook);
         return NULL;
+    }
 
-    pNode = KAVL_GET_POINTER(ppTree);
+    pNode = KAVL_GET_POINTER(&pRoot->mpRoot);
     pNodeLast = NULL;
     if (fAbove)
@@ -62 +66 @@
             {
                 if (pNode->mpLeft == KAVL_NULL)
+                {
+                    KAVL_READ_UNLOCK(pLook);
                     return pNode;
+                }
                 pNodeLast = pNode;
                 pNode = KAVL_GET_POINTER(&pNode->mpLeft);
@@ -69 +76 @@
             {
                 if (pNode->mpRight == KAVL_NULL)
+                {
+                    KAVL_READ_UNLOCK(pLook);
                     return pNodeLast;
+                }
                 pNode = KAVL_GET_POINTER(&pNode->mpRight);
             }
@@ -81 +91 @@
             {
                 if (pNode->mpLeft == KAVL_NULL)
+                {
+                    KAVL_READ_UNLOCK(pLook);
                     return pNodeLast;
+                }
                 pNode = KAVL_GET_POINTER(&pNode->mpLeft);
             }
@@ -87 +100 @@
             {
                 if (pNode->mpRight == KAVL_NULL)
+                {
+                    KAVL_READ_UNLOCK(pLook);
                     return pNode;
+                }
                 pNodeLast = pNode;
                 pNode = KAVL_GET_POINTER(&pNode->mpRight);
@@ -95 +111 @@
 
     /* perfect match or nothing. */
+    KAVL_READ_UNLOCK(pLook);
     return pNode;
 }