X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftdb2%2Fprivate.h;h=6c727aff4a20a62dc800e5806079742cd32d7ec1;hp=9b225521c74808d62bb9c559a08abd7bb18157df;hb=d1cea3ebf96f61b5bbac1e74975700770e06add6;hpb=0455668028cfe8f0417037975bc3d7dd742974db diff --git a/ccan/tdb2/private.h b/ccan/tdb2/private.h index 9b225521..6c727aff 100644 --- a/ccan/tdb2/private.h +++ b/ccan/tdb2/private.h @@ -23,6 +23,7 @@ #include #include #include +#include #include #include #include @@ -60,10 +61,6 @@ typedef uint64_t tdb_len_t; typedef uint64_t tdb_off_t; -#ifndef offsetof -#define offsetof(t,f) ((unsigned int)&((t *)0)->f) -#endif - #define TDB_MAGIC_FOOD "TDB file\n" #define TDB_VERSION ((uint64_t)(0x26011967 + 7)) #define TDB_MAGIC ((uint64_t)0x1999) @@ -113,6 +110,10 @@ typedef uint64_t tdb_off_t; #define TDB_OFF_MASK \ (((1ULL << (64 - TDB_OFF_UPPER_STEAL)) - 1) - TDB_OFF_HASH_GROUP_MASK) +/* We have to be able to fit a free record here. */ +#define TDB_MIN_DATA_LEN \ + (sizeof(struct tdb_free_record) - sizeof(struct tdb_used_record)) + /* We ensure buckets up to size 1 << (zone_bits - TDB_COMFORT_FACTOR_BITS). */ /* FIXME: test this matches size_to_bucket! */ #define BUCKETS_FOR_ZONE(zone_bits) ((zone_bits) + 2 - TDB_COMFORT_FACTOR_BITS) @@ -349,7 +350,8 @@ tdb_off_t find_and_lock(struct tdb_context *tdb, struct tdb_data key, int ltype, struct hash_info *h, - struct tdb_used_record *rec); + struct tdb_used_record *rec, + struct traverse_info *tinfo); int replace_in_hash(struct tdb_context *tdb, struct hash_info *h,