tdb2: tdb_expand on empty database now tested.

[ccan] / ccan / tdb2 / private.h

diff --git a/ccan/tdb2/private.h b/ccan/tdb2/private.h
index 1fe1563549c58617c11518bd422e048f28f299da..c743067a0267fb0059be9218ad56b1305fdcb7fc 100644 (file)
--- a/ccan/tdb2/private.h
+++ b/ccan/tdb2/private.h
@@ -83,10 +83,10 @@ typedef uint64_t tdb_off_t;
 /* Hash chain locks. */
 #define TDB_HASH_LOCK_START 2
 
 /* Hash chain locks. */
 #define TDB_HASH_LOCK_START 2
 

-/* We start wih 256 hash buckets, 10 free buckets.  A 1k-sized zone. */
+/* We start wih 256 hash buckets, 10 free buckets.  A 4k-sized zone. */

 #define INITIAL_HASH_BITS 8
 #define INITIAL_FREE_BUCKETS 10
 #define INITIAL_HASH_BITS 8
 #define INITIAL_FREE_BUCKETS 10

-#define INITIAL_ZONE_BITS 10
+#define INITIAL_ZONE_BITS 12

 
 #if !HAVE_BSWAP_64
 static inline uint64_t bswap_64(uint64_t x)
 
 #if !HAVE_BSWAP_64
 static inline uint64_t bswap_64(uint64_t x)


@@ -223,6 +223,9 @@ struct tdb_context {
        tdb_hashfn_t khash;
        void *hash_priv;
 
        tdb_hashfn_t khash;
        void *hash_priv;
 

+       /* Set if we are in a transaction. */
+       struct tdb_transaction *transaction;
+       

        /* What zone of the tdb to use, for spreading load. */
        uint64_t last_zone; 
 
        /* What zone of the tdb to use, for spreading load. */
        uint64_t last_zone; 
 


@@ -234,9 +237,6 @@ struct tdb_context {
        uint64_t num_lockrecs;
        struct tdb_lock_type *lockrecs;
 
        uint64_t num_lockrecs;
        struct tdb_lock_type *lockrecs;
 

-       /* Set if we are in a transaction. */
-       struct tdb_transaction *transaction;
-       

        /* Single list of all TDBs, to avoid multiple opens. */
        struct tdb_context *next;
        dev_t device;   
        /* Single list of all TDBs, to avoid multiple opens. */
        struct tdb_context *next;
        dev_t device;   


@@ -247,7 +247,7 @@ struct tdb_methods {
        int (*read)(struct tdb_context *, tdb_off_t, void *, tdb_len_t);
        int (*write)(struct tdb_context *, tdb_off_t, const void *, tdb_len_t);
        int (*oob)(struct tdb_context *, tdb_off_t, bool);
        int (*read)(struct tdb_context *, tdb_off_t, void *, tdb_len_t);
        int (*write)(struct tdb_context *, tdb_off_t, const void *, tdb_len_t);
        int (*oob)(struct tdb_context *, tdb_off_t, bool);

-       int (*expand_file)(struct tdb_context *, tdb_len_t, tdb_len_t);
+       int (*expand_file)(struct tdb_context *, tdb_len_t);

 };
 
 /*
 };
 
 /*


@@ -262,7 +262,7 @@ uint64_t tdb_hash(struct tdb_context *tdb, const void *ptr, size_t len);
 
 
 /* free.c: */
 
 
 /* free.c: */

-uint64_t random_free_zone(struct tdb_context *tdb);
+void tdb_zone_init(struct tdb_context *tdb);

 
 /* If this fails, try tdb_expand. */
 tdb_off_t alloc(struct tdb_context *tdb, size_t keylen, size_t datalen,
 
 /* If this fails, try tdb_expand. */
 tdb_off_t alloc(struct tdb_context *tdb, size_t keylen, size_t datalen,


@@ -328,6 +328,8 @@ tdb_off_t tdb_find_zero_off(struct tdb_context *tdb, tdb_off_t off,
 
 /* Even on files, we can get partial writes due to signals. */
 bool tdb_pwrite_all(int fd, const void *buf, size_t len, tdb_off_t off);
 
 /* Even on files, we can get partial writes due to signals. */
 bool tdb_pwrite_all(int fd, const void *buf, size_t len, tdb_off_t off);

+bool tdb_pread_all(int fd, void *buf, size_t len, tdb_off_t off);
+bool tdb_read_all(int fd, void *buf, size_t len);

 
 /* Allocate and make a copy of some offset. */
 void *tdb_alloc_read(struct tdb_context *tdb, tdb_off_t offset, tdb_len_t len);
 
 /* Allocate and make a copy of some offset. */
 void *tdb_alloc_read(struct tdb_context *tdb, tdb_off_t offset, tdb_len_t len);


@@ -344,6 +346,8 @@ int tdb_read_convert(struct tdb_context *tdb, tdb_off_t off,
 uint64_t hash_record(struct tdb_context *tdb, tdb_off_t off);
 
 /* lock.c: */
 uint64_t hash_record(struct tdb_context *tdb, tdb_off_t off);
 
 /* lock.c: */

+void tdb_lock_init(struct tdb_context *tdb);
+

 /* Lock/unlock a particular hash list. */
 int tdb_lock_list(struct tdb_context *tdb, tdb_off_t list,
                  int ltype, enum tdb_lock_flags waitflag);
 /* Lock/unlock a particular hash list. */
 int tdb_lock_list(struct tdb_context *tdb, tdb_off_t list,
                  int ltype, enum tdb_lock_flags waitflag);