tdb2: rearrange log function to put data arg at the end.

[ccan] / ccan / tdb2 / private.h

diff --git a/ccan/tdb2/private.h b/ccan/tdb2/private.h
index 030b46ca38a2fbe1e4b751ebe7717133d98a37d3..a569b1db3667b05e27e6aaf27fdf0afd02182898 100644 (file)
--- a/ccan/tdb2/private.h
+++ b/ccan/tdb2/private.h
@@ -75,7 +75,7 @@ typedef uint64_t tdb_off_t;
 
 /* 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))
 
@@ -89,7 +89,7 @@ typedef int tdb_bool_err;
 /* Expanding file. */
 #define TDB_EXPANSION_LOCK 2
 /* 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
@@ -335,6 +335,7 @@ struct tdb_file {
        int fd;
 
        /* Lock information */
+       pid_t locker;
        struct tdb_lock allrecord_lock;
        size_t num_lockrecs;
        struct tdb_lock *lockrecs;
@@ -364,15 +365,15 @@ struct tdb_context {
        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;
+       void (*log_fn)(struct tdb_context *tdb,
+                      enum tdb_log_level level,
+                      const char *message,
+                      void *data);
+       void *log_data;
 
        /* 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. */
@@ -390,6 +391,9 @@ struct tdb_context {
        /* 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;
 };
@@ -546,7 +550,7 @@ enum TDB_ERROR tdb_unlock_hashes(struct tdb_context *tdb,
                                 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,