tdb2: allow multiple chain locks.

[ccan] / ccan / tdb2 / traverse.c

diff --git a/ccan/tdb2/traverse.c b/ccan/tdb2/traverse.c
index 06f0bc68ee4016b5a90330025f1c2ee34d1ad108..f8a2504dcd61489eb23bf7b84c8e0a88ced07f43 100644 (file)
--- a/ccan/tdb2/traverse.c
+++ b/ccan/tdb2/traverse.c
@@ -18,7 +18,10 @@
 #include "private.h"
 #include <ccan/likely/likely.h>
 
 #include "private.h"
 #include <ccan/likely/likely.h>
 

-int64_t tdb_traverse(struct tdb_context *tdb, tdb_traverse_func fn, void *p)
+int64_t tdb_traverse_(struct tdb_context *tdb,
+                     int (*fn)(struct tdb_context *,
+                               TDB_DATA, TDB_DATA, void *),
+                     void *p)

 {
        enum TDB_ERROR ecode;
        struct traverse_info tinfo;
 {
        enum TDB_ERROR ecode;
        struct traverse_info tinfo;


@@ -34,55 +37,63 @@ int64_t tdb_traverse(struct tdb_context *tdb, tdb_traverse_func fn, void *p)
                count++;
                if (fn && fn(tdb, k, d, p)) {
                        free(k.dptr);
                count++;
                if (fn && fn(tdb, k, d, p)) {
                        free(k.dptr);

-                       break;
+                       tdb->last_error = TDB_SUCCESS;
+                       return count;

                }
                free(k.dptr);
        }
 
        if (ecode != TDB_ERR_NOEXIST) {
                }
                free(k.dptr);
        }
 
        if (ecode != TDB_ERR_NOEXIST) {

-               tdb->ecode = ecode;
-               return -1;
+               return tdb->last_error = ecode;

        }
        }

+       tdb->last_error = TDB_SUCCESS;

        return count;
 }
        
        return count;
 }
        

-TDB_DATA tdb_firstkey(struct tdb_context *tdb)
+enum TDB_ERROR tdb_firstkey(struct tdb_context *tdb, struct tdb_data *key)

 {
        struct traverse_info tinfo;
 {
        struct traverse_info tinfo;

-       struct tdb_data k;
-       enum TDB_ERROR ecode;

 
 

-       ecode = first_in_hash(tdb, &tinfo, &k, NULL);
-       if (ecode == TDB_SUCCESS) {
-               return k;
-       }
-       if (ecode == TDB_ERR_NOEXIST)
-               ecode = TDB_SUCCESS;
-       tdb->ecode = ecode;
-       return tdb_null;
+       return tdb->last_error = first_in_hash(tdb, &tinfo, key, NULL);

 }
 
 /* We lock twice, not very efficient.  We could keep last key & tinfo cached. */
 }
 
 /* We lock twice, not very efficient.  We could keep last key & tinfo cached. */

-TDB_DATA tdb_nextkey(struct tdb_context *tdb, TDB_DATA key)
+enum TDB_ERROR tdb_nextkey(struct tdb_context *tdb, struct tdb_data *key)

 {
        struct traverse_info tinfo;
        struct hash_info h;
        struct tdb_used_record rec;
 {
        struct traverse_info tinfo;
        struct hash_info h;
        struct tdb_used_record rec;

-       enum TDB_ERROR ecode;

 
 

-       tinfo.prev = find_and_lock(tdb, key, F_RDLCK, &h, &rec, &tinfo);
+       tinfo.prev = find_and_lock(tdb, *key, F_RDLCK, &h, &rec, &tinfo);
+       free(key->dptr);

        if (TDB_OFF_IS_ERR(tinfo.prev)) {
        if (TDB_OFF_IS_ERR(tinfo.prev)) {

-               tdb->ecode = tinfo.prev;
-               return tdb_null;
+               return tdb->last_error = tinfo.prev;

        }
        tdb_unlock_hashes(tdb, h.hlock_start, h.hlock_range, F_RDLCK);
 
        }
        tdb_unlock_hashes(tdb, h.hlock_start, h.hlock_range, F_RDLCK);
 

-       ecode = next_in_hash(tdb, &tinfo, &key, NULL);
-       if (ecode == TDB_SUCCESS) {
-               return key;
-       }
-       if (ecode == TDB_ERR_NOEXIST)
-               ecode = TDB_SUCCESS;
-       tdb->ecode = ecode;
-       return tdb_null;
+       return tdb->last_error = next_in_hash(tdb, &tinfo, key, NULL);
+}
+
+static int wipe_one(struct tdb_context *tdb,
+                   TDB_DATA key, TDB_DATA data, enum TDB_ERROR *ecode)
+{
+       *ecode = tdb_delete(tdb, key);
+       return (*ecode != TDB_SUCCESS);
+}
+
+enum TDB_ERROR tdb_wipe_all(struct tdb_context *tdb)
+{
+       enum TDB_ERROR ecode;
+       int64_t count;
+
+       ecode = tdb_allrecord_lock(tdb, F_WRLCK, TDB_LOCK_WAIT, false);
+       if (ecode != TDB_SUCCESS)
+               return tdb->last_error = ecode;
+
+       /* FIXME: Be smarter. */
+       count = tdb_traverse(tdb, wipe_one, &ecode);
+       if (count < 0)
+               ecode = count;
+       tdb_allrecord_unlock(tdb, F_WRLCK);
+       return tdb->last_error = ecode;

 }
 }