tdb2: rearrange tdb_context layout so tdb1_context can match

[ccan] / ccan / tdb2 / private.h

diff --git a/ccan/tdb2/private.h b/ccan/tdb2/private.h
index 030b46ca38a2fbe1e4b751ebe7717133d98a37d3..8d961e82c365c6b0f6956fbf1019451c285597f5 100644 (file)
--- a/ccan/tdb2/private.h
+++ b/ccan/tdb2/private.h
@@ -18,26 +18,19 @@
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
 
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
 

-#include "config.h"
-#include <stdint.h>
-#include <stdbool.h>
+#include <ccan/tdb2/tdb2.h>

 #include <stdlib.h>
 #include <stddef.h>
 #include <sys/time.h>
 #include <sys/mman.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <stdlib.h>
 #include <stddef.h>
 #include <sys/time.h>
 #include <sys/mman.h>
 #include <unistd.h>
 #include <fcntl.h>

-#include <string.h>

 #include <errno.h>
 #include <stdio.h>
 #include <utime.h>
 #include <unistd.h>
 #include <errno.h>
 #include <stdio.h>
 #include <utime.h>
 #include <unistd.h>

-#include <ccan/tdb2/tdb2.h>

 #include <ccan/likely/likely.h>
 #include <ccan/likely/likely.h>

-#include <ccan/compiler/compiler.h>
-#if HAVE_BYTESWAP_H
-#include <byteswap.h>
-#endif
+#include <ccan/endian/endian.h>

 
 #ifndef TEST_IT
 #define TEST_IT(cond)
 
 #ifndef TEST_IT
 #define TEST_IT(cond)


@@ -75,7 +68,7 @@ typedef uint64_t tdb_off_t;
 
 /* Packing errors into pointers and v.v. */
 #define TDB_PTR_IS_ERR(ptr) \
 
 /* Packing errors into pointers and v.v. */
 #define TDB_PTR_IS_ERR(ptr) \

-       unlikely((void *)(ptr) >= (void *)(long)TDB_ERR_LAST)
+       unlikely((unsigned long)(ptr) >= (unsigned long)TDB_ERR_LAST)

 #define TDB_PTR_ERR(p) ((enum TDB_ERROR)(long)(p))
 #define TDB_ERR_PTR(err) ((void *)(long)(err))
 
 #define TDB_PTR_ERR(p) ((enum TDB_ERROR)(long)(p))
 #define TDB_ERR_PTR(err) ((void *)(long)(err))
 


@@ -84,12 +77,12 @@ typedef int tdb_bool_err;
 
 /* Prevent others from opening the file. */
 #define TDB_OPEN_LOCK 0
 
 /* 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
 /* Expanding file. */
 #define TDB_EXPANSION_LOCK 2

+/* Doing a transaction. */
+#define TDB_TRANSACTION_LOCK 8

 /* Hash chain locks. */
 /* Hash chain locks. */

-#define TDB_HASH_LOCK_START 3
+#define TDB_HASH_LOCK_START 64

 
 /* Range for hash locks. */
 #define TDB_HASH_LOCK_RANGE_BITS 30
 
 /* Range for hash locks. */
 #define TDB_HASH_LOCK_RANGE_BITS 30


@@ -134,20 +127,6 @@ typedef int tdb_bool_err;
 /* Indicates this entry is not on an flist (can happen during coalescing) */
 #define TDB_FTABLE_NONE ((1ULL << TDB_OFF_UPPER_STEAL) - 1)
 
 /* Indicates this entry is not on an flist (can happen during coalescing) */
 #define TDB_FTABLE_NONE ((1ULL << TDB_OFF_UPPER_STEAL) - 1)
 

-#if !HAVE_BSWAP_64
-static inline uint64_t bswap_64(uint64_t x)
-{
-       return (((x&0x000000FFULL)<<56)
-               | ((x&0x0000FF00ULL)<<48)
-               | ((x&0x00FF0000ULL)<<40)
-               | ((x&0xFF000000ULL)<<32)
-               | ((x>>8)&0xFF000000ULL)
-               | ((x>>16)&0x00FF0000ULL)
-               | ((x>>24)&0x0000FF00ULL)
-               | ((x>>32)&0x000000FFULL));
-}
-#endif
-

 struct tdb_used_record {
        /* For on-disk compatibility, we avoid bitfields:
           magic: 16,        (highest)
 struct tdb_used_record {
        /* For on-disk compatibility, we avoid bitfields:
           magic: 16,        (highest)


@@ -219,7 +198,7 @@ static inline unsigned frec_ftable(const struct tdb_free_record *f)
 
 struct tdb_recovery_record {
        uint64_t magic;
 
 struct tdb_recovery_record {
        uint64_t magic;

-       /* Length of record. */
+       /* Length of record (add this header to get total length). */

        uint64_t max_len;
        /* Length used. */
        uint64_t len;
        uint64_t max_len;
        /* Length used. */
        uint64_t len;


@@ -304,7 +283,7 @@ enum tdb_lock_flags {
 
 struct tdb_lock {
        struct tdb_context *owner;
 
 struct tdb_lock {
        struct tdb_context *owner;

-       uint32_t off;
+       off_t off;

        uint32_t count;
        uint32_t ltype;
 };
        uint32_t count;
        uint32_t ltype;
 };


@@ -319,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;
 


@@ -335,6 +311,7 @@ struct tdb_file {
        int fd;
 
        /* Lock information */
        int fd;
 
        /* Lock information */

+       pid_t locker;

        struct tdb_lock allrecord_lock;
        size_t num_lockrecs;
        struct tdb_lock *lockrecs;
        struct tdb_lock allrecord_lock;
        size_t num_lockrecs;
        struct tdb_lock *lockrecs;


@@ -345,34 +322,40 @@ 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;
 
        /* 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;
-
-       /* Error code for last tdb error. */
-       enum TDB_ERROR ecode;
-
-       /* the flags passed to tdb_open, for tdb_reopen. */
+       /* 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;
+
+       /* Open flags passed to tdb_open. */
+       int open_flags;
+
+       /* 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;
+
+       /* the flags passed to tdb_open. */

        uint32_t flags;
 
        uint32_t flags;
 

-       /* Logging function */
-       void (*logfn)(struct tdb_context *tdb,
-                     enum tdb_log_level level,
-                     void *log_private,
-                     const char *message);
-       void *log_private;
+       /* Our statistics. */
+       struct tdb_attribute_stats stats;
+
+       /* Are we accessing directly? (debugging check). */
+       int direct_access;

 
        /* Hash function. */
 
        /* Hash function. */

-       uint64_t (*khash)(const void *key, size_t len, uint64_t seed, void *);
-       void *hash_priv;
+       uint64_t (*hash_fn)(const void *key, size_t len, uint64_t seed, void *);
+       void *hash_data;

        uint64_t hash_seed;
 
        /* Set if we are in a transaction. */
        uint64_t hash_seed;
 
        /* Set if we are in a transaction. */


@@ -382,14 +365,19 @@ 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;
 

-       struct tdb_attribute_stats *stats;
-

        /* Direct access information */
        struct tdb_access_hdr *access;
 
        /* Direct access information */
        struct tdb_access_hdr *access;
 

+       /* Last error we returned. */
+       enum TDB_ERROR last_error;
+

        /* The actual file information */
        struct tdb_file *file;
 };
        /* The actual file information */
        struct tdb_file *file;
 };


@@ -408,8 +396,6 @@ struct tdb_methods {
   internal prototypes
 */
 /* hash.c: */
   internal prototypes
 */
 /* hash.c: */

-void tdb_hash_init(struct tdb_context *tdb);
-

 tdb_bool_err first_in_hash(struct tdb_context *tdb,
                           struct traverse_info *tinfo,
                           TDB_DATA *kbuf, size_t *dlen);
 tdb_bool_err first_in_hash(struct tdb_context *tdb,
                           struct traverse_info *tinfo,
                           TDB_DATA *kbuf, size_t *dlen);


@@ -457,7 +443,9 @@ tdb_off_t alloc(struct tdb_context *tdb, size_t keylen, size_t datalen,
 
 /* Put this record in a free list. */
 enum TDB_ERROR add_free_record(struct tdb_context *tdb,
 
 /* Put this record in a free list. */
 enum TDB_ERROR add_free_record(struct tdb_context *tdb,

-                              tdb_off_t off, tdb_len_t len_with_header);
+                              tdb_off_t off, tdb_len_t len_with_header,
+                              enum tdb_lock_flags waitflag,
+                              bool coalesce_ok);

 
 /* Set up header for a used/ftable/htable/chain record. */
 enum TDB_ERROR set_header(struct tdb_context *tdb,
 
 /* Set up header for a used/ftable/htable/chain record. */
 enum TDB_ERROR set_header(struct tdb_context *tdb,


@@ -528,14 +516,6 @@ enum TDB_ERROR tdb_read_convert(struct tdb_context *tdb, tdb_off_t off,
 /* Bump the seqnum (caller checks for tdb->flags & TDB_SEQNUM) */
 void tdb_inc_seqnum(struct tdb_context *tdb);
 
 /* Bump the seqnum (caller checks for tdb->flags & TDB_SEQNUM) */
 void tdb_inc_seqnum(struct tdb_context *tdb);
 

-/* Adds a stat, if it's in range. */
-void add_stat_(struct tdb_context *tdb, uint64_t *stat, size_t val);
-#define add_stat(tdb, statname, val)                                   \
-       do {                                                            \
-               if (unlikely((tdb)->stats))                             \
-                       add_stat_((tdb), &(tdb)->stats->statname, (val)); \
-       } while (0)
-

 /* lock.c: */
 /* Lock/unlock a range of hashes. */
 enum TDB_ERROR tdb_lock_hashes(struct tdb_context *tdb,
 /* lock.c: */
 /* Lock/unlock a range of hashes. */
 enum TDB_ERROR tdb_lock_hashes(struct tdb_context *tdb,


@@ -546,7 +526,7 @@ enum TDB_ERROR tdb_unlock_hashes(struct tdb_context *tdb,
                                 tdb_len_t hash_range, int ltype);
 
 /* For closing the file. */
                                 tdb_len_t hash_range, int ltype);
 
 /* For closing the file. */

-void tdb_unlock_all(struct tdb_context *tdb);
+void tdb_lock_cleanup(struct tdb_context *tdb);

 
 /* Lock/unlock a particular free bucket. */
 enum TDB_ERROR tdb_lock_free_bucket(struct tdb_context *tdb, tdb_off_t b_off,
 
 /* Lock/unlock a particular free bucket. */
 enum TDB_ERROR tdb_lock_free_bucket(struct tdb_context *tdb, tdb_off_t b_off,


@@ -568,8 +548,8 @@ enum TDB_ERROR tdb_allrecord_upgrade(struct tdb_context *tdb);
 
 /* Serialize db open. */
 enum TDB_ERROR tdb_lock_open(struct tdb_context *tdb,
 
 /* Serialize db open. */
 enum TDB_ERROR tdb_lock_open(struct tdb_context *tdb,

-                            enum tdb_lock_flags flags);
-void tdb_unlock_open(struct tdb_context *tdb);
+                            int ltype, enum tdb_lock_flags flags);
+void tdb_unlock_open(struct tdb_context *tdb, int ltype);

 bool tdb_has_open_lock(struct tdb_context *tdb);
 
 /* Serialize db expand. */
 bool tdb_has_open_lock(struct tdb_context *tdb);
 
 /* Serialize db expand. */


@@ -580,6 +560,10 @@ bool tdb_has_expansion_lock(struct tdb_context *tdb);
 /* If it needs recovery, grab all the locks and do it. */
 enum TDB_ERROR tdb_lock_and_recover(struct tdb_context *tdb);
 
 /* If it needs recovery, grab all the locks and do it. */
 enum TDB_ERROR tdb_lock_and_recover(struct tdb_context *tdb);
 

+/* Default lock and unlock functions. */
+int tdb_fcntl_lock(int fd, int rw, off_t off, off_t len, bool waitflag, void *);
+int tdb_fcntl_unlock(int fd, int rw, off_t off, off_t len, void *);
+

 /* transaction.c: */
 enum TDB_ERROR tdb_transaction_recover(struct tdb_context *tdb);
 tdb_bool_err tdb_needs_recovery(struct tdb_context *tdb);
 /* transaction.c: */
 enum TDB_ERROR tdb_transaction_recover(struct tdb_context *tdb);
 tdb_bool_err tdb_needs_recovery(struct tdb_context *tdb);