X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftdb2%2Fopen.c;h=49804acfba427236382eb5e76d9790e05833eea7;hp=83a83e0ba578b75e873c7900a140f08b7cf00b22;hb=c8f6f8c2dea76042f74c02eff048847e62adcca6;hpb=6b7c3c840eafbec211b9f58751c5ff754302a68e
diff --git a/ccan/tdb2/open.c b/ccan/tdb2/open.c
index 83a83e0b..49804acf 100644
--- a/ccan/tdb2/open.c
+++ b/ccan/tdb2/open.c
@@ -16,23 +16,22 @@
License along with this library; if not, see .
*/
#include "private.h"
-#include
#include
-/* all lock info, to detect double-opens (fcntl file don't nest!) */
-static struct tdb_file *files = NULL;
+/* all tdbs, to detect double-opens (fcntl file don't nest!) */
+static struct tdb_context *tdbs = NULL;
static struct tdb_file *find_file(dev_t device, ino_t ino)
{
- struct tdb_file *i;
+ struct tdb_context *i;
- for (i = files; i; i = i->next) {
- if (i->device == device && i->inode == ino) {
- i->refcnt++;
- break;
+ for (i = tdbs; i; i = i->next) {
+ if (i->file->device == device && i->file->inode == ino) {
+ i->file->refcnt++;
+ return i->file;
}
}
- return i;
+ return NULL;
}
static bool read_all(int fd, void *buf, size_t len)
@@ -242,16 +241,6 @@ enum TDB_ERROR tdb_set_attribute(struct tdb_context *tdb,
return TDB_SUCCESS;
}
-static uint64_t jenkins_hash(const void *key, size_t length, uint64_t seed,
- void *unused)
-{
- uint64_t ret;
- /* hash64_stable assumes lower bits are more important; they are a
- * slightly better hash. We use the upper bits first, so swap them. */
- ret = hash64_stable((const unsigned char *)key, length, seed);
- return (ret >> 32) | (ret << 32);
-}
-
enum TDB_ERROR tdb_get_attribute(struct tdb_context *tdb,
union tdb_attribute *attr)
{
@@ -270,11 +259,11 @@ enum TDB_ERROR tdb_get_attribute(struct tdb_context *tdb,
attr->seed.seed = tdb->hash_seed;
break;
case TDB_ATTRIBUTE_OPENHOOK:
- return tdb->last_error
- = tdb_logerr(tdb, TDB_ERR_EINVAL,
- TDB_LOG_USE_ERROR,
- "tdb_get_attribute:"
- " cannot get TDB_ATTRIBUTE_OPENHOOK");
+ if (!tdb->openhook)
+ return tdb->last_error = TDB_ERR_NOEXIST;
+ attr->openhook.fn = tdb->openhook;
+ attr->openhook.data = tdb->openhook_data;
+ break;
case TDB_ATTRIBUTE_STATS: {
size_t size = attr->stats.size;
if (size > tdb->stats.size)
@@ -306,16 +295,16 @@ void tdb_unset_attribute(struct tdb_context *tdb,
case TDB_ATTRIBUTE_LOG:
tdb->log_fn = NULL;
break;
+ case TDB_ATTRIBUTE_OPENHOOK:
+ tdb->openhook = NULL;
+ break;
case TDB_ATTRIBUTE_HASH:
case TDB_ATTRIBUTE_SEED:
- case TDB_ATTRIBUTE_OPENHOOK:
tdb_logerr(tdb, TDB_ERR_EINVAL, TDB_LOG_USE_ERROR,
"tdb_unset_attribute: cannot unset %s after opening",
type == TDB_ATTRIBUTE_HASH
? "TDB_ATTRIBUTE_HASH"
- : type == TDB_ATTRIBUTE_SEED
- ? "TDB_ATTRIBUTE_SEED"
- : "TDB_ATTRIBUTE_OPENHOOK");
+ : "TDB_ATTRIBUTE_SEED");
break;
case TDB_ATTRIBUTE_STATS:
tdb_logerr(tdb, TDB_ERR_EINVAL,
@@ -347,7 +336,6 @@ struct tdb_context *tdb_open(const char *name, int tdb_flags,
ssize_t rlen;
struct tdb_header hdr;
struct tdb_attribute_seed *seed = NULL;
- struct tdb_attribute_openhook *openhook = NULL;
tdb_bool_err berr;
enum TDB_ERROR ecode;
int openlock;
@@ -364,21 +352,22 @@ struct tdb_context *tdb_open(const char *name, int tdb_flags,
} else {
tdb->name = NULL;
}
- tdb->direct_access = 0;
tdb->flags = tdb_flags;
tdb->log_fn = NULL;
- tdb->transaction = NULL;
- tdb->access = NULL;
tdb->open_flags = open_flags;
tdb->last_error = TDB_SUCCESS;
tdb->file = NULL;
+ tdb->openhook = NULL;
tdb->lock_fn = tdb_fcntl_lock;
tdb->unlock_fn = tdb_fcntl_unlock;
- tdb->hash_fn = jenkins_hash;
+ tdb->hash_fn = tdb_jenkins_hash;
memset(&tdb->stats, 0, sizeof(tdb->stats));
tdb->stats.base.attr = TDB_ATTRIBUTE_STATS;
tdb->stats.size = sizeof(tdb->stats);
tdb_io_init(tdb);
+ tdb->tdb2.direct_access = 0;
+ tdb->tdb2.transaction = NULL;
+ tdb->tdb2.access = NULL;
while (attr) {
switch (attr->base.attr) {
@@ -390,7 +379,8 @@ struct tdb_context *tdb_open(const char *name, int tdb_flags,
seed = &attr->seed;
break;
case TDB_ATTRIBUTE_OPENHOOK:
- openhook = &attr->openhook;
+ tdb->openhook = attr->openhook.fn;
+ tdb->openhook_data = attr->openhook.data;
break;
default:
/* These are set as normal. */
@@ -402,7 +392,8 @@ struct tdb_context *tdb_open(const char *name, int tdb_flags,
}
if (tdb_flags & ~(TDB_INTERNAL | TDB_NOLOCK | TDB_NOMMAP | TDB_CONVERT
- | TDB_NOSYNC | TDB_SEQNUM | TDB_ALLOW_NESTING)) {
+ | TDB_NOSYNC | TDB_SEQNUM | TDB_ALLOW_NESTING
+ | TDB_RDONLY)) {
ecode = tdb_logerr(tdb, TDB_ERR_EINVAL, TDB_LOG_USE_ERROR,
"tdb_open: unknown flags %u", tdb_flags);
goto fail;
@@ -416,10 +407,16 @@ struct tdb_context *tdb_open(const char *name, int tdb_flags,
}
if ((open_flags & O_ACCMODE) == O_RDONLY) {
- tdb->read_only = true;
openlock = F_RDLCK;
+ tdb->flags |= TDB_RDONLY;
} else {
- tdb->read_only = false;
+ if (tdb_flags & TDB_RDONLY) {
+ ecode = tdb_logerr(tdb, TDB_ERR_EINVAL,
+ TDB_LOG_USE_ERROR,
+ "tdb_open: can't use TDB_RDONLY"
+ " without O_RDONLY");
+ goto fail;
+ }
openlock = F_WRLCK;
}
@@ -475,7 +472,6 @@ struct tdb_context *tdb_open(const char *name, int tdb_flags,
goto fail;
}
- tdb->file->next = files;
tdb->file->fd = fd;
tdb->file->device = st.st_dev;
tdb->file->inode = st.st_ino;
@@ -491,8 +487,8 @@ struct tdb_context *tdb_open(const char *name, int tdb_flags,
}
/* call their open hook if they gave us one. */
- if (openhook) {
- ecode = openhook->fn(tdb->file->fd, openhook->data);
+ if (tdb->openhook) {
+ ecode = tdb->openhook(tdb->file->fd, tdb->openhook_data);
if (ecode != TDB_SUCCESS) {
tdb_logerr(tdb, ecode, TDB_LOG_ERROR,
"tdb_open: open hook failed");
@@ -566,7 +562,7 @@ struct tdb_context *tdb_open(const char *name, int tdb_flags,
tdb_unlock_open(tdb, openlock);
/* This make sure we have current map_size and mmap. */
- ecode = tdb->methods->oob(tdb, tdb->file->map_size + 1, true);
+ ecode = tdb->tdb2.io->oob(tdb, tdb->file->map_size + 1, true);
if (unlikely(ecode != TDB_SUCCESS))
goto fail;
@@ -588,9 +584,8 @@ struct tdb_context *tdb_open(const char *name, int tdb_flags,
goto fail;
}
- /* Add to linked list if we're new. */
- if (tdb->file->refcnt == 1)
- files = tdb->file;
+ tdb->next = tdbs;
+ tdbs = tdb;
return tdb;
fail:
@@ -645,10 +640,11 @@ fail_errno:
int tdb_close(struct tdb_context *tdb)
{
int ret = 0;
+ struct tdb_context **i;
tdb_trace(tdb, "tdb_close");
- if (tdb->transaction) {
+ if (tdb->tdb2.transaction) {
tdb_transaction_cancel(tdb);
}
@@ -659,24 +655,22 @@ int tdb_close(struct tdb_context *tdb)
tdb_munmap(tdb->file);
}
if (tdb->file) {
- struct tdb_file **i;
-
tdb_lock_cleanup(tdb);
if (--tdb->file->refcnt == 0) {
ret = close(tdb->file->fd);
-
- /* Remove from files list */
- for (i = &files; *i; i = &(*i)->next) {
- if (*i == tdb->file) {
- *i = tdb->file->next;
- break;
- }
- }
free(tdb->file->lockrecs);
free(tdb->file);
}
}
+ /* Remove from tdbs list */
+ for (i = &tdbs; *i; i = &(*i)->next) {
+ if (*i == tdb) {
+ *i = tdb->next;
+ break;
+ }
+ }
+
#ifdef TDB_TRACE
close(tdb->tracefd);
#endif
@@ -684,3 +678,13 @@ int tdb_close(struct tdb_context *tdb)
return ret;
}
+
+void tdb_foreach_(int (*fn)(struct tdb_context *, void *), void *p)
+{
+ struct tdb_context *i;
+
+ for (i = tdbs; i; i = i->next) {
+ if (fn(i, p) != 0)
+ break;
+ }
+}