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

trunk/include/k/kAvlTmpl/kAvlDestroy.h

@@ -41 +41 @@
  *          made on it. Note that the node we fail on will be considered dead and
  *          no action is taken to link it back into the tree.
- * @param   ppTree          Pointer to the AVL-tree root node pointer.
+ * @param   pRoot           Pointer to the AVL-tree root structure.
  * @param   pfnCallBack     Pointer to callback function.
  * @param   pvUser          User parameter passed on to the callback function.
  */
-KAVL_DECL(int) KAVL_FN(Destroy)(KAVLTREEPTR *ppTree, KAVL_TYPE(PFN,CALLBACK) pfnCallBack, void *pvUser)
+KAVL_DECL(int) KAVL_FN(Destroy)(KAVLROOT *pRoot, KAVL_TYPE(PFN,CALLBACK) pfnCallBack, void *pvUser)
 {
+#ifdef KAVL_LOOKTHRU
+    unsigned    i;
+#endif
     unsigned    cEntries;
     KAVLNODE   *apEntries[KAVL_MAX_STACK];
     int         rc;
 
-    if (*ppTree == KAVL_NULL)
+    KAVL_WRITE_LOCK(pRoot);
+    if (pRoot->mpRoot == KAVL_NULL)
+    {
+        KAVL_WRITE_UNLOCK(pRoot);
         return 0;
+    }
+
+#ifdef KAVL_LOOKTHRU
+    /* 
+     * Kill the lookthru cache.
+     */
+    for (i = 0; i < (KAVL_LOOKTHRU); i++)
+        pRoot->maLookthru[i] = KAVL_NULL;
+#endif
 
     cEntries = 1;
-    apEntries[0] = KAVL_GET_POINTER(ppTree);
+    apEntries[0] = KAVL_GET_POINTER(&pRoot->mpRoot);
     while (cEntries > 0)
     {
@@ -80 +95 @@
                 rc = pfnCallBack(pEqual, pvUser);
                 if (rc)
+                {
+                    KAVL_WRITE_UNLOCK(pRoot);
                     return rc;
+                }
             }
 #endif
@@ -96 +114 @@
             }
             else
-                *ppTree = KAVL_NULL;
+                pRoot->mpRoot = KAVL_NULL;
 
             kHlpAssert(pNode->mpLeft == KAVL_NULL);
@@ -102 +120 @@
             rc = pfnCallBack(pNode, pvUser);
             if (rc)
+            {
+                KAVL_WRITE_UNLOCK(pRoot);
                 return rc;
+            }
         }
     } /* while */
-    kHlpAssert(*ppTree == KAVL_NULL);
+    kHlpAssert(pRoot->mpRoot == KAVL_NULL);
 
+    KAVL_WRITE_UNLOCK(pRoot);
     return 0;
 }