X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftdb2%2Ftdb.c;h=a2d36b373c4b7d875aeb45e477366a2ae3371972;hp=02642f58c97427b27a03e9bd8c7bd0c17d087328;hb=5802573130c841d10734e1b0dcdb0b13167f9c86;hpb=efdf0f2d8f34b4c01c82c558b350ec36c7329b1e
diff --git a/ccan/tdb2/tdb.c b/ccan/tdb2/tdb.c
index 02642f58..a2d36b37 100644
--- a/ccan/tdb2/tdb.c
+++ b/ccan/tdb2/tdb.c
@@ -1,10 +1,24 @@
+ /*
+ Trivial Database 2: fetch, store and misc routines.
+ 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
+ version 3 of the License, or (at your option) any later version.
+
+ This library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, see .
+*/
#include "private.h"
#include
#include
-/* The null return. */
-struct tdb_data tdb_null = { .dptr = NULL, .dsize = 0 };
-
static enum TDB_ERROR update_rec_hdr(struct tdb_context *tdb,
tdb_off_t off,
tdb_len_t keylen,
@@ -41,10 +55,11 @@ static enum TDB_ERROR replace_data(struct tdb_context *tdb,
/* We didn't like the existing one: remove it. */
if (old_off) {
- add_stat(tdb, frees, 1);
+ tdb->stats.frees++;
ecode = add_free_record(tdb, old_off,
sizeof(struct tdb_used_record)
- + key.dsize + old_room);
+ + key.dsize + old_room,
+ TDB_LOCK_WAIT, true);
if (ecode == TDB_SUCCESS)
ecode = replace_in_hash(tdb, h, new_off);
} else {
@@ -66,7 +81,9 @@ static enum TDB_ERROR replace_data(struct tdb_context *tdb,
return ecode;
}
- /* FIXME: tdb_increment_seqnum(tdb); */
+ if (tdb->flags & TDB_SEQNUM)
+ tdb_inc_seqnum(tdb);
+
return TDB_SUCCESS;
}
@@ -82,6 +99,9 @@ static enum TDB_ERROR update_data(struct tdb_context *tdb,
/* Put a zero in; future versions may append other data. */
ecode = tdb->methods->twrite(tdb, off + dbuf.dsize, "", 1);
}
+ if (tdb->flags & TDB_SEQNUM)
+ tdb_inc_seqnum(tdb);
+
return ecode;
}
@@ -96,7 +116,7 @@ enum TDB_ERROR tdb_store(struct tdb_context *tdb,
off = find_and_lock(tdb, key, F_WRLCK, &h, &rec, NULL);
if (TDB_OFF_IS_ERR(off)) {
- return off;
+ return tdb->last_error = off;
}
/* Now we have lock on this hash bucket. */
@@ -126,7 +146,7 @@ enum TDB_ERROR tdb_store(struct tdb_context *tdb,
}
tdb_unlock_hashes(tdb, h.hlock_start,
h.hlock_range, F_WRLCK);
- return TDB_SUCCESS;
+ return tdb->last_error = TDB_SUCCESS;
}
} else {
if (flag == TDB_MODIFY) {
@@ -143,7 +163,7 @@ enum TDB_ERROR tdb_store(struct tdb_context *tdb,
ecode = replace_data(tdb, &h, key, dbuf, off, old_room, off);
out:
tdb_unlock_hashes(tdb, h.hlock_start, h.hlock_range, F_WRLCK);
- return ecode;
+ return tdb->last_error = ecode;
}
enum TDB_ERROR tdb_append(struct tdb_context *tdb,
@@ -159,7 +179,7 @@ enum TDB_ERROR tdb_append(struct tdb_context *tdb,
off = find_and_lock(tdb, key, F_WRLCK, &h, &rec, NULL);
if (TDB_OFF_IS_ERR(off)) {
- return off;
+ return tdb->last_error = off;
}
if (off) {
@@ -211,7 +231,7 @@ out_free_newdata:
free(newdata);
out:
tdb_unlock_hashes(tdb, h.hlock_start, h.hlock_range, F_WRLCK);
- return ecode;
+ return tdb->last_error = ecode;
}
enum TDB_ERROR tdb_fetch(struct tdb_context *tdb, struct tdb_data key,
@@ -224,7 +244,7 @@ enum TDB_ERROR tdb_fetch(struct tdb_context *tdb, struct tdb_data key,
off = find_and_lock(tdb, key, F_RDLCK, &h, &rec, NULL);
if (TDB_OFF_IS_ERR(off)) {
- return off;
+ return tdb->last_error = off;
}
if (!off) {
@@ -240,7 +260,24 @@ enum TDB_ERROR tdb_fetch(struct tdb_context *tdb, struct tdb_data key,
}
tdb_unlock_hashes(tdb, h.hlock_start, h.hlock_range, F_RDLCK);
- return ecode;
+ return tdb->last_error = ecode;
+}
+
+bool tdb_exists(struct tdb_context *tdb, TDB_DATA key)
+{
+ tdb_off_t off;
+ struct tdb_used_record rec;
+ struct hash_info h;
+
+ off = find_and_lock(tdb, key, F_RDLCK, &h, &rec, NULL);
+ if (TDB_OFF_IS_ERR(off)) {
+ tdb->last_error = off;
+ return false;
+ }
+ tdb_unlock_hashes(tdb, h.hlock_start, h.hlock_range, F_RDLCK);
+
+ tdb->last_error = TDB_SUCCESS;
+ return off ? true : false;
}
enum TDB_ERROR tdb_delete(struct tdb_context *tdb, struct tdb_data key)
@@ -252,7 +289,7 @@ enum TDB_ERROR tdb_delete(struct tdb_context *tdb, struct tdb_data key)
off = find_and_lock(tdb, key, F_WRLCK, &h, &rec, NULL);
if (TDB_OFF_IS_ERR(off)) {
- return off;
+ return tdb->last_error = off;
}
if (!off) {
@@ -266,16 +303,20 @@ enum TDB_ERROR tdb_delete(struct tdb_context *tdb, struct tdb_data key)
}
/* Free the deleted entry. */
- add_stat(tdb, frees, 1);
+ tdb->stats.frees++;
ecode = add_free_record(tdb, off,
sizeof(struct tdb_used_record)
+ rec_key_length(&rec)
+ rec_data_length(&rec)
- + rec_extra_padding(&rec));
+ + rec_extra_padding(&rec),
+ TDB_LOCK_WAIT, true);
+
+ if (tdb->flags & TDB_SEQNUM)
+ tdb_inc_seqnum(tdb);
unlock:
tdb_unlock_hashes(tdb, h.hlock_start, h.hlock_range, F_WRLCK);
- return ecode;
+ return tdb->last_error = ecode;
}
unsigned int tdb_get_flags(struct tdb_context *tdb)
@@ -286,8 +327,9 @@ unsigned int tdb_get_flags(struct tdb_context *tdb)
void tdb_add_flag(struct tdb_context *tdb, unsigned flag)
{
if (tdb->flags & TDB_INTERNAL) {
- tdb_logerr(tdb, TDB_ERR_EINVAL, TDB_LOG_USE_ERROR,
- "tdb_add_flag: internal db");
+ tdb->last_error = tdb_logerr(tdb, TDB_ERR_EINVAL,
+ TDB_LOG_USE_ERROR,
+ "tdb_add_flag: internal db");
return;
}
switch (flag) {
@@ -296,22 +338,31 @@ void tdb_add_flag(struct tdb_context *tdb, unsigned flag)
break;
case TDB_NOMMAP:
tdb->flags |= TDB_NOMMAP;
- tdb_munmap(tdb);
+ tdb_munmap(tdb->file);
break;
case TDB_NOSYNC:
tdb->flags |= TDB_NOSYNC;
break;
+ case TDB_SEQNUM:
+ tdb->flags |= TDB_SEQNUM;
+ break;
+ case TDB_ALLOW_NESTING:
+ tdb->flags |= TDB_ALLOW_NESTING;
+ break;
default:
- tdb_logerr(tdb, TDB_ERR_EINVAL, TDB_LOG_USE_ERROR,
- "tdb_add_flag: Unknown flag %u", flag);
+ tdb->last_error = tdb_logerr(tdb, TDB_ERR_EINVAL,
+ TDB_LOG_USE_ERROR,
+ "tdb_add_flag: Unknown flag %u",
+ flag);
}
}
void tdb_remove_flag(struct tdb_context *tdb, unsigned flag)
{
if (tdb->flags & TDB_INTERNAL) {
- tdb_logerr(tdb, TDB_ERR_EINVAL, TDB_LOG_USE_ERROR,
- "tdb_remove_flag: internal db");
+ tdb->last_error = tdb_logerr(tdb, TDB_ERR_EINVAL,
+ TDB_LOG_USE_ERROR,
+ "tdb_remove_flag: internal db");
return;
}
switch (flag) {
@@ -325,9 +376,17 @@ void tdb_remove_flag(struct tdb_context *tdb, unsigned flag)
case TDB_NOSYNC:
tdb->flags &= ~TDB_NOSYNC;
break;
+ case TDB_SEQNUM:
+ tdb->flags &= ~TDB_SEQNUM;
+ break;
+ case TDB_ALLOW_NESTING:
+ tdb->flags &= ~TDB_ALLOW_NESTING;
+ break;
default:
- tdb_logerr(tdb, TDB_ERR_EINVAL, TDB_LOG_USE_ERROR,
- "tdb_remove_flag: Unknown flag %u", flag);
+ tdb->last_error = tdb_logerr(tdb, TDB_ERR_EINVAL,
+ TDB_LOG_USE_ERROR,
+ "tdb_remove_flag: Unknown flag %u",
+ flag);
}
}
@@ -348,6 +407,11 @@ const char *tdb_errorstr(enum TDB_ERROR ecode)
return "Invalid error code";
}
+enum TDB_ERROR tdb_error(struct tdb_context *tdb)
+{
+ return tdb->last_error;
+}
+
enum TDB_ERROR COLD tdb_logerr(struct tdb_context *tdb,
enum TDB_ERROR ecode,
enum tdb_log_level level,
@@ -359,7 +423,7 @@ enum TDB_ERROR COLD tdb_logerr(struct tdb_context *tdb,
/* tdb_open paths care about errno, so save it. */
int saved_errno = errno;
- if (!tdb->logfn)
+ if (!tdb->log_fn)
return ecode;
va_start(ap, fmt);
@@ -367,13 +431,71 @@ enum TDB_ERROR COLD tdb_logerr(struct tdb_context *tdb,
va_end(ap);
if (len < 0) {
- tdb->logfn(tdb, TDB_LOG_ERROR, tdb->log_private,
- "out of memory formatting message:");
- tdb->logfn(tdb, level, tdb->log_private, fmt);
+ tdb->log_fn(tdb, TDB_LOG_ERROR,
+ "out of memory formatting message:", tdb->log_data);
+ tdb->log_fn(tdb, level, fmt, tdb->log_data);
} else {
- tdb->logfn(tdb, level, tdb->log_private, message);
+ tdb->log_fn(tdb, level, message, tdb->log_data);
free(message);
}
errno = saved_errno;
return ecode;
}
+
+enum TDB_ERROR tdb_parse_record_(struct tdb_context *tdb,
+ TDB_DATA key,
+ enum TDB_ERROR (*parse)(TDB_DATA k,
+ TDB_DATA d,
+ void *data),
+ void *data)
+{
+ tdb_off_t off;
+ struct tdb_used_record rec;
+ struct hash_info h;
+ enum TDB_ERROR ecode;
+
+ off = find_and_lock(tdb, key, F_RDLCK, &h, &rec, NULL);
+ if (TDB_OFF_IS_ERR(off)) {
+ return tdb->last_error = off;
+ }
+
+ if (!off) {
+ ecode = TDB_ERR_NOEXIST;
+ } else {
+ const void *dptr;
+ dptr = tdb_access_read(tdb, off + sizeof(rec) + key.dsize,
+ rec_data_length(&rec), false);
+ if (TDB_PTR_IS_ERR(dptr)) {
+ ecode = TDB_PTR_ERR(dptr);
+ } else {
+ TDB_DATA d = tdb_mkdata(dptr, rec_data_length(&rec));
+
+ ecode = parse(key, d, data);
+ tdb_access_release(tdb, dptr);
+ }
+ }
+
+ tdb_unlock_hashes(tdb, h.hlock_start, h.hlock_range, F_RDLCK);
+ return tdb->last_error = ecode;
+}
+
+const char *tdb_name(const struct tdb_context *tdb)
+{
+ return tdb->name;
+}
+
+int64_t tdb_get_seqnum(struct tdb_context *tdb)
+{
+ tdb_off_t off = tdb_read_off(tdb, offsetof(struct tdb_header, seqnum));
+ if (TDB_OFF_IS_ERR(off))
+ tdb->last_error = off;
+ else
+ tdb->last_error = TDB_SUCCESS;
+ return off;
+}
+
+
+int tdb_fd(const struct tdb_context *tdb)
+{
+ return tdb->file->fd;
+}