X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftdb2%2Ftdb1_open.c;h=c1729b577f78a857e117d84d0bcab8de69df2247;hp=74cc464539d1b782c6119cd5592d88c4fc21003e;hb=49475d68deecd0b31597ed6094229171d2699b11;hpb=bbeb528e74c0e234e1f724ac8d54be404cfc6f9a
diff --git a/ccan/tdb2/tdb1_open.c b/ccan/tdb2/tdb1_open.c
index 74cc4645..c1729b57 100644
--- a/ccan/tdb2/tdb1_open.c
+++ b/ccan/tdb2/tdb1_open.c
@@ -24,12 +24,9 @@
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, see .
*/
-
+#include
#include "tdb1_private.h"
-/* all contexts, to ensure no double-opens (fcntl locks don't nest!) */
-static struct tdb_context *tdb1s = NULL;
-
/* We use two hashes to double-check they're using the right hash function. */
void tdb1_header_hash(struct tdb_context *tdb,
uint32_t *magic1_hash, uint32_t *magic2_hash)
@@ -98,37 +95,15 @@ static int tdb1_new_database(struct tdb_context *tdb, int hash_size)
return ret;
}
+typedef void (*tdb1_log_func)(struct tdb_context *, enum tdb_log_level, enum TDB_ERROR,
+ const char *, void *);
+typedef uint64_t (*tdb1_hash_func)(const void *key, size_t len, uint64_t seed,
+ void *data);
-
-static int tdb1_already_open(dev_t device,
- ino_t ino)
-{
- struct tdb_context *i;
-
- for (i = tdb1s; i; i = i->next) {
- if (i->file->device == device && i->file->inode == ino) {
- return 1;
- }
- }
-
- return 0;
-}
-
-/* open the database, creating it if necessary
-
- The open_flags and mode are passed straight to the open call on the
- database file. A flags value of O_WRONLY is invalid. The hash size
- is advisory, use zero for a default value.
-
- Return is NULL on error, in which case errno is also set. Don't
- try to call tdb1_error or tdb1_errname, just do strerror(errno).
-
- @param name may be NULL for internal databases. */
-struct tdb_context *tdb1_open(const char *name, int hash_size, int tdb1_flags,
- int open_flags, mode_t mode)
-{
- return tdb1_open_ex(name, hash_size, tdb1_flags, open_flags, mode, NULL, NULL);
-}
+struct tdb1_logging_context {
+ tdb1_log_func log_fn;
+ void *log_private;
+};
static bool hash_correct(struct tdb_context *tdb,
uint32_t *m1, uint32_t *m2)
@@ -154,7 +129,7 @@ static bool check_header_hash(struct tdb_context *tdb,
return hash_correct(tdb, m1, m2);
}
-struct tdb_context *tdb1_open_ex(const char *name, int hash_size, int tdb1_flags,
+static struct tdb_context *tdb1_open_ex(const char *name, int hash_size, int tdb1_flags,
int open_flags, mode_t mode,
const struct tdb1_logging_context *log_ctx,
tdb1_hash_func hash_fn)
@@ -247,8 +222,6 @@ struct tdb_context *tdb1_open_ex(const char *name, int hash_size, int tdb1_flags
goto fail;
}
- if (hash_size == 0)
- hash_size = TDB1_DEFAULT_HASH_SIZE;
if ((open_flags & O_ACCMODE) == O_RDONLY) {
tdb->flags |= TDB_RDONLY;
/* read only databases don't do locking */
@@ -337,16 +310,6 @@ struct tdb_context *tdb1_open_ex(const char *name, int hash_size, int tdb1_flags
goto fail;
}
- /* Is it already in the open list? If so, fail. */
- if (tdb1_already_open(st.st_dev, st.st_ino)) {
- tdb_logerr(tdb, TDB_ERR_IO, TDB_LOG_USE_ERROR,
- "tdb1_open_ex: "
- "%s (%d,%d) is already open in this process",
- name, (int)st.st_dev, (int)st.st_ino);
- errno = EBUSY;
- goto fail;
- }
-
tdb->file->map_size = st.st_size;
tdb->file->device = st.st_dev;
tdb->file->inode = st.st_ino;
@@ -364,8 +327,6 @@ struct tdb_context *tdb1_open_ex(const char *name, int hash_size, int tdb1_flags
if (tdb1_nest_unlock(tdb, TDB1_OPEN_LOCK, F_WRLCK) == -1) {
goto fail;
}
- tdb->next = tdb1s;
- tdb1s = tdb;
return tdb;
fail:
@@ -395,6 +356,53 @@ struct tdb_context *tdb1_open_ex(const char *name, int hash_size, int tdb1_flags
}
}
+/* Temporart wrapper for transition. */
+struct tdb_context *tdb1_open(const char *name, int tdb1_flags,
+ int open_flags, mode_t mode,
+ union tdb_attribute *attr)
+{
+ struct tdb1_logging_context *log_ctx = NULL, log;
+ tdb1_hash_func hash_fn = NULL;
+ struct tdb_attribute_tdb1_hashsize *hsize = NULL;
+
+ while (attr) {
+ switch (attr->base.attr) {
+ case TDB_ATTRIBUTE_HASH:
+ hash_fn = attr->hash.fn;
+ break;
+ case TDB_ATTRIBUTE_LOG:
+ log.log_fn = attr->log.fn;
+ log.log_private = attr->log.data;
+ log_ctx = &log;
+ break;
+ case TDB_ATTRIBUTE_TDB1_HASHSIZE:
+ hsize = &attr->tdb1_hashsize;
+ break;
+ break;
+ default:
+ abort();
+ }
+ attr = attr->base.next;
+ }
+
+ if (hsize && !(open_flags & O_CREAT)) {
+ if (log_ctx) {
+ log_ctx->log_fn(NULL,
+ TDB_ERR_EINVAL,
+ TDB_LOG_USE_ERROR,
+ "tdb_open: can only use"
+ " TDB_ATTRIBUTE_TDB1_HASHSIZE when"
+ " creating a tdb",
+ log_ctx->log_private);
+ }
+ errno = EINVAL;
+ return NULL;
+ }
+ return tdb1_open_ex(name, hsize ? hsize->hsize : TDB1_DEFAULT_HASH_SIZE,
+ tdb1_flags, open_flags, mode,
+ log_ctx, hash_fn);
+}
+
/*
* Set the maximum number of dead records per hash chain
*/
@@ -411,7 +419,6 @@ void tdb1_set_max_dead(struct tdb_context *tdb, int max_dead)
**/
int tdb1_close(struct tdb_context *tdb)
{
- struct tdb_context **i;
int ret = 0;
if (tdb->tdb1.transaction) {
@@ -432,14 +439,6 @@ int tdb1_close(struct tdb_context *tdb)
SAFE_FREE(tdb->file->lockrecs);
SAFE_FREE(tdb->file);
- /* Remove from contexts list */
- for (i = &tdb1s; *i; i = &(*i)->next) {
- if (*i == tdb) {
- *i = tdb->next;
- break;
- }
- }
-
memset(tdb, 0, sizeof(*tdb));
SAFE_FREE(tdb);