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

trunk/include/k/kAvlTmpl/kAvlGetWithParent.h

@@ -37 +37 @@
  * The tree remains unchanged.
  *
- * @returns   Pointer to the node holding the given key.
- * @param     ppTree    Pointer to the AVL-tree root node pointer.
- * @param     ppParent  Pointer to a variable which will hold the pointer to the partent node on
+ * @returns Pointer to the node holding the given key.
+ * @param   pRoot       Pointer to the AVL-tree root structure.
+ * @param   ppParent    Pointer to a variable which will hold the pointer to the partent node on
  *                      return. When no node is found, this will hold the last searched node.
- * @param     Key       Key value of the node which is to be found.
+ * @param   Key         Key value of the node which is to be found.
  */
-KAVL_DECL(KAVLNODE *) KAVL_FN(GetWithParent)(KAVLTREEPTR *ppTree, KAVLNODE **ppParent, KAVLKEY Key)
+KAVL_DECL(KAVLNODE *) KAVL_FN(GetWithParent)(KAVLROOT *pRoot, KAVLNODE **ppParent, KAVLKEY Key)
 {
-    register KAVLNODE *pNode = KAVL_GET_POINTER_NULL(ppTree);
-    register KAVLNODE *pParent = NULL;
+    register KAVLNODE *pNode;
+    register KAVLNODE *pParent;
 
+    KAVL_READ_LOCK(pRoot);
+
+    pParent = NULL;
+    pNode = KAVL_GET_POINTER_NULL(&pRoot->mpRoot);
     while (     pNode != NULL
            &&   KAVL_NE(pNode->mKey, Key))
@@ -58 +62 @@
     }
 
+    KAVL_UNLOCK(pRoot);
+
     *ppParent = pParent;
     return pNode;