tdb2: keep link of every non-internal tdb.

[ccan] / ccan / tdb2 / private.h

diff --git a/ccan/tdb2/private.h b/ccan/tdb2/private.h
index 6a742496971303a256b41779956669195ae7f3ca..cc3bd6a96ba2d44ab3993b813119f2fac882e6fa 100644 (file)
--- a/ccan/tdb2/private.h
+++ b/ccan/tdb2/private.h
@@ -77,10 +77,10 @@ typedef int tdb_bool_err;
 
 /* Prevent others from opening the file. */
 #define TDB_OPEN_LOCK 0
-/* Doing a transaction. */
-#define TDB_TRANSACTION_LOCK 1
 /* Expanding file. */
 #define TDB_EXPANSION_LOCK 2
+/* Doing a transaction. */
+#define TDB_TRANSACTION_LOCK 8
 /* Hash chain locks. */
 #define TDB_HASH_LOCK_START 64
 
@@ -283,7 +283,7 @@ enum tdb_lock_flags {
 
 struct tdb_lock {
        struct tdb_context *owner;
-       uint32_t off;
+       off_t off;
        uint32_t count;
        uint32_t ltype;
 };
@@ -298,9 +298,6 @@ struct tdb_access_hdr {
 };
 
 struct tdb_file {
-       /* Single list of all TDBs, to detect multiple opens. */
-       struct tdb_file *next;
-
        /* How many are sharing us? */
        unsigned int refcnt;
 
@@ -325,17 +322,17 @@ struct tdb_file {
 };
 
 struct tdb_context {
+       /* Single list of all TDBs, to detect multiple opens. */
+       struct tdb_context *next;
+
        /* Filename of the database. */
        const char *name;
 
        /* Are we accessing directly? (debugging check). */
        int direct_access;
 
-       /* Operating read-only? (Opened O_RDONLY, or in traverse_read) */
-       bool read_only;
-
-       /* mmap read only? */
-       int mmap_flags;
+       /* Open flags passed to tdb_open. */
+       int open_flags;
 
        /* the flags passed to tdb_open, for tdb_reopen. */
        uint32_t flags;
@@ -343,6 +340,7 @@ struct tdb_context {
        /* Logging function */
        void (*log_fn)(struct tdb_context *tdb,
                       enum tdb_log_level level,
+                      enum TDB_ERROR ecode,
                       const char *message,
                       void *data);
        void *log_data;
@@ -364,6 +362,10 @@ struct tdb_context {
        tdb_off_t ftable_off;
        unsigned int ftable;
 
+       /* Our open hook, if any. */
+       enum TDB_ERROR (*openhook)(int fd, void *data);
+       void *openhook_data;
+
        /* IO methods: changes for transactions. */
        const struct tdb_methods *methods;