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

trunk/include/k/kAvlTmpl/kAvlDoWithAll.h

@@ -43 +43 @@
     KAVLNODE       *aEntries[KAVL_MAX_STACK];
     char            achFlags[KAVL_MAX_STACK];
+    KAVLROOT        pRoot;
 } KAVL_INT(STACK2);
 
@@ -50 +51 @@
  *
  * @returns   0 on success. Return from callback on failure.
- * @param     ppTree       Pointer to the AVL-tree root node pointer.
+ * @param     pRoot        Pointer to the AVL-tree root structure.
  * @param     fFromLeft    K_TRUE:  Left to right.
  *                         K_FALSE: Right to left.
@@ -56 +57 @@
  * @param     pvUser       User parameter passed on to the callback function.
  */
-KAVL_DECL(int) KAVL_FN(DoWithAll)(KAVLTREEPTR *ppTree, KBOOL fFromLeft, KAVL_TYPE(PFN,CALLBACK) pfnCallBack, void *pvUser)
+KAVL_DECL(int) KAVL_FN(DoWithAll)(KAVLROOT *pRoot, KBOOL fFromLeft, KAVL_TYPE(PFN,CALLBACK) pfnCallBack, void *pvUser)
 {
     KAVL_INT(STACK2)    AVLStack;
@@ -65 +66 @@
     int                 rc;
 
-    if (*ppTree == KAVL_NULL)
+    KAVL_READ_LOCK(pRoot);
+    if (pRoot->mpRoot == KAVL_NULL)
+    {
+        KAVL_READ_UNLOCK(pRoot);
         return 0;
+    }
 
     AVLStack.cEntries = 1;
     AVLStack.achFlags[0] = 0;
-    AVLStack.aEntries[0] = KAVL_GET_POINTER(ppTree);
+    AVLStack.aEntries[0] = KAVL_GET_POINTER(&pRoot->mpRoot);
 
     if (fFromLeft)
@@ -99 +104 @@
                     rc = pfnCallBack(pEqual, pvUser);
                     if (rc)
+                    {
+                        KAVL_READ_UNLOCK(pRoot);
                         return rc;
+                    }
                 }
 #endif
@@ -139 +147 @@
                     rc = pfnCallBack(pEqual, pvUser);
                     if (rc)
+                    {
+                        KAVL_READ_UNLOCK(pRoot);
                         return rc;
+                    }
                 }
 #endif
@@ -153 +164 @@
     }
 
+    KAVL_READ_UNLOCK(pRoot);
     return 0;
 }