tdb2: remove tdb_traverse_read

[ccan] / ccan / tdb2 / traverse.c

diff --git a/ccan/tdb2/traverse.c b/ccan/tdb2/traverse.c
index 66319dd56764d823dfca54544cfd2ee0d22aea03..9c71d0d1fb7e7752b9bdb1738427bd3c49421720 100644 (file)
--- a/ccan/tdb2/traverse.c
+++ b/ccan/tdb2/traverse.c
@@ -1,7 +1,7 @@
- /* 
+ /*
    Trivial Database 2: traverse function.
    Copyright (C) Rusty Russell 2010
-   
+
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
    License as published by the Free Software Foundation; either
@@ -18,41 +18,66 @@
 #include "private.h"
 #include <ccan/likely/likely.h>
 
-static int64_t traverse(struct tdb_context *tdb, int ltype,
-                       tdb_traverse_func fn, void *p)
+int64_t tdb_traverse(struct tdb_context *tdb, tdb_traverse_func fn, void *p)
 {
        int ret;
        struct traverse_info tinfo;
        struct tdb_data k, d;
        int64_t count = 0;
 
-       for (ret = first_in_hash(tdb, ltype, &tinfo, &k, &d.dsize);
+       k.dptr = NULL;
+       for (ret = first_in_hash(tdb, &tinfo, &k, &d.dsize);
             ret == 1;
-            ret = next_in_hash(tdb, ltype, &tinfo, &k, &d.dsize)) {
+            ret = next_in_hash(tdb, &tinfo, &k, &d.dsize)) {
                d.dptr = k.dptr + k.dsize;
                
                count++;
-               if (fn && fn(tdb, k, d, p))
+               if (fn && fn(tdb, k, d, p)) {
+                       free(k.dptr);
                        break;
+               }
+               free(k.dptr);
        }
 
        if (ret < 0)
                return -1;
        return count;
 }
-
-int64_t tdb_traverse(struct tdb_context *tdb, tdb_traverse_func fn, void *p)
+       
+TDB_DATA tdb_firstkey(struct tdb_context *tdb)
 {
-       return traverse(tdb, F_WRLCK, fn, p);
+       struct traverse_info tinfo;
+       struct tdb_data k;
+       switch (first_in_hash(tdb, &tinfo, &k, NULL)) {
+       case 1:
+               return k;
+       case 0:
+               tdb->ecode = TDB_SUCCESS;
+               /* Fall thru... */
+       default:
+               return tdb_null;
+       }
 }
-       
-int64_t tdb_traverse_read(struct tdb_context *tdb,
-                         tdb_traverse_func fn, void *p)
+
+/* We lock twice, not very efficient.  We could keep last key & tinfo cached. */
+TDB_DATA tdb_nextkey(struct tdb_context *tdb, TDB_DATA key)
 {
-       int64_t ret;
-       bool was_ro = tdb->read_only;
-       tdb->read_only = true;
-       ret = traverse(tdb, F_RDLCK, fn, p);
-       tdb->read_only = was_ro;
-       return ret;
+       struct traverse_info tinfo;
+       struct hash_info h;
+       struct tdb_used_record rec;
+
+       tinfo.prev = find_and_lock(tdb, key, F_RDLCK, &h, &rec, &tinfo);
+       if (unlikely(tinfo.prev == TDB_OFF_ERR))
+               return tdb_null;
+       tdb_unlock_hashes(tdb, h.hlock_start, h.hlock_range, F_RDLCK);
+
+       switch (next_in_hash(tdb, &tinfo, &key, NULL)) {
+       case 1:
+               return key;
+       case 0:
+               tdb->ecode = TDB_SUCCESS;
+               /* Fall thru... */
+       default:
+               return tdb_null;
+       }
 }