Commit cd1c68c0 authored by Rusty Russell's avatar Rusty Russell

tdb2: add missing prototype, move tdb_firstkey/tdb_nextkey to traverse.c

parent bee60dd0
...@@ -602,41 +602,3 @@ int first_in_hash(struct tdb_context *tdb, int ltype, ...@@ -602,41 +602,3 @@ int first_in_hash(struct tdb_context *tdb, int ltype,
return next_in_hash(tdb, ltype, tinfo, kbuf, dlen); return next_in_hash(tdb, ltype, tinfo, kbuf, dlen);
} }
TDB_DATA tdb_firstkey(struct tdb_context *tdb)
{
struct traverse_info tinfo;
struct tdb_data k;
switch (first_in_hash(tdb, F_RDLCK, &tinfo, &k, NULL)) {
case 1:
return k;
case 0:
tdb->ecode = TDB_SUCCESS;
/* Fall thru... */
default:
return tdb_null;
}
}
/* We lock twice, not very efficient. We could keep last key & tinfo cached. */
TDB_DATA tdb_nextkey(struct tdb_context *tdb, TDB_DATA key)
{
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, F_RDLCK, &tinfo, &key, NULL)) {
case 1:
return key;
case 0:
tdb->ecode = TDB_SUCCESS;
/* Fall thru... */
default:
return tdb_null;
}
}
...@@ -133,6 +133,8 @@ int tdb_chainunlock(struct tdb_context *tdb, TDB_DATA key); ...@@ -133,6 +133,8 @@ int tdb_chainunlock(struct tdb_context *tdb, TDB_DATA key);
int64_t tdb_traverse(struct tdb_context *tdb, tdb_traverse_func fn, void *p); int64_t tdb_traverse(struct tdb_context *tdb, tdb_traverse_func fn, void *p);
int64_t tdb_traverse_read(struct tdb_context *tdb, int64_t tdb_traverse_read(struct tdb_context *tdb,
tdb_traverse_func fn, void *p); tdb_traverse_func fn, void *p);
TDB_DATA tdb_firstkey(struct tdb_context *tdb);
TDB_DATA tdb_nextkey(struct tdb_context *tdb, TDB_DATA key);
int tdb_close(struct tdb_context *tdb); int tdb_close(struct tdb_context *tdb);
int tdb_check(struct tdb_context *tdb, int tdb_check(struct tdb_context *tdb,
int (*check)(TDB_DATA key, TDB_DATA data, void *private_data), int (*check)(TDB_DATA key, TDB_DATA data, void *private_data),
......
...@@ -56,3 +56,41 @@ int64_t tdb_traverse_read(struct tdb_context *tdb, ...@@ -56,3 +56,41 @@ int64_t tdb_traverse_read(struct tdb_context *tdb,
tdb->read_only = was_ro; tdb->read_only = was_ro;
return ret; return ret;
} }
TDB_DATA tdb_firstkey(struct tdb_context *tdb)
{
struct traverse_info tinfo;
struct tdb_data k;
switch (first_in_hash(tdb, F_RDLCK, &tinfo, &k, NULL)) {
case 1:
return k;
case 0:
tdb->ecode = TDB_SUCCESS;
/* Fall thru... */
default:
return tdb_null;
}
}
/* We lock twice, not very efficient. We could keep last key & tinfo cached. */
TDB_DATA tdb_nextkey(struct tdb_context *tdb, TDB_DATA key)
{
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, F_RDLCK, &tinfo, &key, NULL)) {
case 1:
return key;
case 0:
tdb->ecode = TDB_SUCCESS;
/* Fall thru... */
default:
return tdb_null;
}
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment