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 b84c2f980db36252d6df496fcb00e12dc87619fa..cc3bd6a96ba2d44ab3993b813119f2fac882e6fa 100644 (file)
--- a/ccan/tdb2/private.h
+++ b/ccan/tdb2/private.h
@@ -298,9 +298,6 @@ struct tdb_access_hdr {
 };
 
 struct tdb_file {
 };
 
 struct tdb_file {

-       /* Single list of all TDBs, to detect multiple opens. */
-       struct tdb_file *next;
-

        /* How many are sharing us? */
        unsigned int refcnt;
 
        /* How many are sharing us? */
        unsigned int refcnt;
 


@@ -325,17 +322,17 @@ struct tdb_file {
 };
 
 struct tdb_context {
 };
 
 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;
 
        /* 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;
 
        /* 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,
        /* 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;
                       const char *message,
                       void *data);
        void *log_data;


@@ -364,6 +362,10 @@ struct tdb_context {
        tdb_off_t ftable_off;
        unsigned int ftable;
 
        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;
 
        /* IO methods: changes for transactions. */
        const struct tdb_methods *methods;