tdb2: make tdb1 use same low-level lock functions.

[ccan] / ccan / tdb2 / tdb1_private.h

diff --git a/ccan/tdb2/tdb1_private.h b/ccan/tdb2/tdb1_private.h
index 0d40d7a9190cc88dad9cc48334e3787a7527c369..9350076f27d08a76e45be3de46a117c90af678cd 100644 (file)
--- a/ccan/tdb2/tdb1_private.h
+++ b/ccan/tdb2/tdb1_private.h
@@ -35,6 +35,32 @@
 #define tdb_error(tdb) \
        tdb_error((struct tdb_context *)(tdb))
 
+#define tdb_brlock(tdb1, rw_type, offset, len, flags)  \
+       tdb_brlock((struct tdb_context *)(tdb1),        \
+                  (rw_type), (offset), (len), (flags))
+
+#define tdb_brunlock(tdb1, rw_type, offset, len) \
+       tdb_brunlock((struct tdb_context *)(tdb1), (rw_type), (offset), (len))
+
+#define tdb_nest_lock(tdb1, offset, ltype, flags)      \
+       tdb_nest_lock((struct tdb_context *)(tdb1), (offset), (ltype), (flags))
+
+#define tdb_nest_unlock(tdb1, offset, ltype)   \
+       tdb_nest_unlock((struct tdb_context *)(tdb1), (offset), (ltype))
+
+#define tdb_allrecord_lock(tdb1, offset, flags, upgradable)            \
+       tdb_allrecord_lock((struct tdb_context *)(tdb1),                \
+                          (offset), (flags), (upgradable))
+
+#define tdb_allrecord_unlock(tdb1, ltype)                              \
+       tdb_allrecord_unlock((struct tdb_context *)(tdb1), (ltype))
+
+#define tdb_allrecord_upgrade(tdb1, start)                             \
+       tdb_allrecord_upgrade((struct tdb_context *)(tdb1), (start))
+
+#define tdb_lock_gradual(tdb1, ltype, flags, off, len) \
+       tdb_lock_gradual((struct tdb_context *)(tdb1),  \
+                        (ltype), (flags), (off), (len))
 /***** END FIXME ***/
 
 #include <limits.h>
@@ -135,12 +161,6 @@ struct tdb1_header {
        tdb1_off_t reserved[27];
 };
 
-struct tdb1_lock_type {
-       uint32_t off;
-       uint32_t count;
-       uint32_t ltype;
-};
-
 struct tdb1_traverse_lock {
        struct tdb1_traverse_lock *next;
        uint32_t off;
@@ -174,22 +194,27 @@ struct tdb1_context {
        /* Last error we returned. */
        enum TDB_ERROR last_error; /* error code for last tdb error */
 
-       void *map_ptr; /* where it is currently mapped */
-       int fd; /* open file descriptor for the database */
-       tdb1_len_t map_size; /* how much space has been mapped */
-       int read_only; /* opened read-only */
+       /* The actual file information */
+       struct tdb_file *file;
+
+       int open_flags; /* flags used in the open - needed by reopen */
+
+       /* low level (fnctl) lock functions. */
+       int (*lock_fn)(int fd, int rw, off_t off, off_t len, bool w, void *);
+       int (*unlock_fn)(int fd, int rw, off_t off, off_t len, void *);
+       void *lock_data;
+
+       uint32_t flags; /* the flags passed to tdb1_open */
+
+       /* Our statistics. */
+       struct tdb_attribute_stats stats;
+
+       bool read_only; /* opened read-only */
        int traverse_read; /* read-only traversal */
        int traverse_write; /* read-write traversal */
-       struct tdb1_lock_type allrecord_lock; /* .offset == upgradable */
-       int num_lockrecs;
-       struct tdb1_lock_type *lockrecs; /* only real locks, all with count>0 */
        struct tdb1_header header; /* a cached copy of the header */
-       uint32_t flags; /* the flags passed to tdb1_open */
        struct tdb1_traverse_lock travlocks; /* current traversal locks */
-       dev_t device;   /* uniquely identifies this tdb */
-       ino_t inode;    /* uniquely identifies this tdb */
        unsigned int (*hash_fn)(TDB_DATA *key);
-       int open_flags; /* flags used in the open - needed by reopen */
        const struct tdb1_methods *methods;
        struct tdb1_transaction *transaction;
        int page_size;