X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftdb2%2Fprivate.h;h=b60f33a0a2012224d9e3192090cad82dd1d76d64;hp=333eb20ec5431d3399cc650990c40e48b15c801c;hb=a56db4a5cbf4346ec8a74322b5267d47b2590ed7;hpb=ef9dec6018e1f0c6e546245a1478be523592d02d diff --git a/ccan/tdb2/private.h b/ccan/tdb2/private.h index 333eb20e..b60f33a0 100644 --- a/ccan/tdb2/private.h +++ b/ccan/tdb2/private.h @@ -36,6 +36,7 @@ #include "config.h" #include #include +#include #ifdef HAVE_BYTESWAP_H #include #endif @@ -65,10 +66,9 @@ typedef uint64_t tdb_off_t; #define TDB_VERSION ((uint64_t)(0x26011967 + 7)) #define TDB_MAGIC ((uint64_t)0x1999) #define TDB_FREE_MAGIC ((uint64_t)0xFE) -#define TDB_COALESCING_MAGIC ((uint64_t)0xFD) #define TDB_HASH_MAGIC (0xA1ABE11A01092008ULL) -#define TDB_RECOVERY_MAGIC (0xf53bc0e7U) -#define TDB_RECOVERY_INVALID_MAGIC (0x0) +#define TDB_RECOVERY_MAGIC (0xf53bc0e7ad124589ULL) +#define TDB_RECOVERY_INVALID_MAGIC (0x0ULL) #define TDB_OFF_ERR ((tdb_off_t)-1) @@ -91,20 +91,22 @@ typedef uint64_t tdb_off_t; #define TDB_SUBLEVEL_HASH_BITS 6 /* And 8 entries in each group, ie 8 groups per sublevel. */ #define TDB_HASH_GROUP_BITS 3 +/* This is currently 10: beyond this we chain. */ +#define TDB_MAX_LEVELS (1+(64-TDB_TOPLEVEL_HASH_BITS) / TDB_SUBLEVEL_HASH_BITS) -/* Extend file by least 32 times larger than needed. */ -#define TDB_EXTENSION_FACTOR 32 +/* Extend file by least 100 times larger than needed. */ +#define TDB_EXTENSION_FACTOR 100 /* We steal bits from the offsets to store hash info. */ #define TDB_OFF_HASH_GROUP_MASK ((1ULL << TDB_HASH_GROUP_BITS) - 1) /* We steal this many upper bits, giving a maximum offset of 64 exabytes. */ #define TDB_OFF_UPPER_STEAL 8 #define TDB_OFF_UPPER_STEAL_EXTRA 7 -#define TDB_OFF_UPPER_STEAL_TRUNCBIT 1 -/* If this is set, hash is truncated (only 1 bit is valid). */ -#define TDB_OFF_HASH_TRUNCATED_BIT 56 -/* The bit number where we store next level of hash. */ +/* The bit number where we store extra hash bits. */ #define TDB_OFF_HASH_EXTRA_BIT 57 +#define TDB_OFF_UPPER_STEAL_SUBHASH_BIT 56 + +/* The bit number where we store the extra hash bits. */ /* Convenience mask to get actual offset. */ #define TDB_OFF_MASK \ (((1ULL << (64 - TDB_OFF_UPPER_STEAL)) - 1) - TDB_OFF_HASH_GROUP_MASK) @@ -116,6 +118,9 @@ typedef uint64_t tdb_off_t; #define TDB_MIN_DATA_LEN \ (sizeof(struct tdb_free_record) - sizeof(struct tdb_used_record)) +/* Indicates this entry is not on an flist (can happen during coalescing) */ +#define TDB_FLIST_NONE ((1ULL << TDB_OFF_UPPER_STEAL) - 1) + #if !HAVE_BSWAP_64 static inline uint64_t bswap_64(uint64_t x) { @@ -173,22 +178,48 @@ static inline uint16_t rec_magic(const struct tdb_used_record *r) } struct tdb_free_record { - uint64_t magic_and_meta; /* TDB_OFF_UPPER_STEAL bits of magic */ - uint64_t data_len; /* Not counting these two fields. */ - /* This is why the minimum record size is 16 bytes. */ - uint64_t next, prev; + uint64_t magic_and_prev; /* TDB_OFF_UPPER_STEAL bits magic, then prev */ + uint64_t flist_and_len; /* Len not counting these two fields. */ + /* This is why the minimum record size is 8 bytes. */ + uint64_t next; }; +static inline uint64_t frec_prev(const struct tdb_free_record *f) +{ + return f->magic_and_prev & ((1ULL << (64 - TDB_OFF_UPPER_STEAL)) - 1); +} + static inline uint64_t frec_magic(const struct tdb_free_record *f) { - return f->magic_and_meta >> (64 - TDB_OFF_UPPER_STEAL); + return f->magic_and_prev >> (64 - TDB_OFF_UPPER_STEAL); } -static inline uint64_t frec_flist(const struct tdb_free_record *f) +static inline uint64_t frec_len(const struct tdb_free_record *f) { - return f->magic_and_meta & ((1ULL << (64 - TDB_OFF_UPPER_STEAL)) - 1); + return f->flist_and_len & ((1ULL << (64 - TDB_OFF_UPPER_STEAL))-1); } +static inline unsigned frec_flist(const struct tdb_free_record *f) +{ + return f->flist_and_len >> (64 - TDB_OFF_UPPER_STEAL); +} + +struct tdb_recovery_record { + uint64_t magic; + /* Length of record. */ + uint64_t max_len; + /* Length used. */ + uint64_t len; + /* Old length of file before transaction. */ + uint64_t eof; +}; + +/* If we bottom out of the subhashes, we chain. */ +struct tdb_chain { + tdb_off_t rec[1 << TDB_HASH_GROUP_BITS]; + tdb_off_t next; +}; + /* this is stored at the front of every database */ struct tdb_header { char magic_food[64]; /* for /etc/magic */ @@ -197,8 +228,9 @@ struct tdb_header { uint64_t hash_test; /* result of hashing HASH_MAGIC. */ uint64_t hash_seed; /* "random" seed written at creation time. */ tdb_off_t free_list; /* (First) free list. */ + tdb_off_t recovery; /* Transaction recovery area. */ - tdb_off_t reserved[27]; + tdb_off_t reserved[26]; /* Top level hash table. */ tdb_off_t hashtable[1ULL << TDB_TOPLEVEL_HASH_BITS]; @@ -235,7 +267,7 @@ struct traverse_info { /* We ignore groups here, and treat it as a big array. */ unsigned entry; unsigned int total_buckets; - } levels[64 / TDB_SUBLEVEL_HASH_BITS]; + } levels[TDB_MAX_LEVELS + 1]; unsigned int num_levels; unsigned int toplevel_group; /* This makes delete-everything-inside-traverse work as expected. */ @@ -248,6 +280,8 @@ enum tdb_lock_flags { TDB_LOCK_WAIT = 1, /* If set, don't log an error on failure. */ TDB_LOCK_PROBE = 2, + /* If set, don't check for recovery (used by recovery code). */ + TDB_LOCK_NOCHECK = 4, }; struct tdb_lock_type { @@ -285,8 +319,8 @@ struct tdb_context { uint32_t flags; /* Logging function */ - tdb_logfn_t log; - void *log_priv; + tdb_logfn_t logfn; + void *log_private; /* Hash function. */ tdb_hashfn_t khash; @@ -298,15 +332,18 @@ struct tdb_context { /* What freelist are we using? */ uint64_t flist_off; + unsigned int flist; /* IO methods: changes for transactions. */ const struct tdb_methods *methods; /* Lock information */ struct tdb_lock_type allrecord_lock; - uint64_t num_lockrecs; + size_t num_lockrecs; struct tdb_lock_type *lockrecs; + struct tdb_attribute_stats *stats; + /* Single list of all TDBs, to avoid multiple opens. */ struct tdb_context *next; dev_t device; @@ -318,7 +355,7 @@ struct tdb_methods { 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); - void *(*direct)(struct tdb_context *, tdb_off_t, size_t); + void *(*direct)(struct tdb_context *, tdb_off_t, size_t, bool); }; /* @@ -369,15 +406,18 @@ int add_free_record(struct tdb_context *tdb, tdb_off_t off, tdb_len_t len_with_header); /* Set up header for a used record. */ -int set_header(struct tdb_context *tdb, - struct tdb_used_record *rec, - uint64_t keylen, uint64_t datalen, - uint64_t actuallen, unsigned hashlow); +int set_used_header(struct tdb_context *tdb, + struct tdb_used_record *rec, + uint64_t keylen, uint64_t datalen, + uint64_t actuallen, unsigned hashlow); /* Used by tdb_check to verify. */ unsigned int size_to_bucket(tdb_len_t data_len); tdb_off_t bucket_off(tdb_off_t flist_off, unsigned bucket); +/* Used by tdb_summary */ +size_t dead_space(struct tdb_context *tdb, tdb_off_t off); + /* io.c: */ /* Initialize tdb->methods. */ void tdb_io_init(struct tdb_context *tdb); @@ -389,16 +429,15 @@ void *tdb_convert(const struct tdb_context *tdb, void *buf, tdb_len_t size); void tdb_munmap(struct tdb_context *tdb); void tdb_mmap(struct tdb_context *tdb); -/* Either make a copy into pad and return that, or return ptr into mmap. - * Converts endian (ie. will use pad in that case). */ -void *tdb_get(struct tdb_context *tdb, tdb_off_t off, void *pad, size_t len); - /* Either alloc a copy, or give direct access. Release frees or noop. */ const void *tdb_access_read(struct tdb_context *tdb, tdb_off_t off, tdb_len_t len, bool convert); void *tdb_access_write(struct tdb_context *tdb, tdb_off_t off, tdb_len_t len, bool convert); +/* Is this pointer direct? (Otherwise it's malloced) */ +bool is_direct(const struct tdb_context *tdb, const void *p); + /* Release result of tdb_access_read/write. */ void tdb_access_release(struct tdb_context *tdb, const void *p); /* Commit result of tdb_acces_write. */ @@ -439,6 +478,13 @@ int tdb_write_convert(struct tdb_context *tdb, tdb_off_t off, int tdb_read_convert(struct tdb_context *tdb, tdb_off_t off, void *rec, size_t len); +/* 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: */ void tdb_lock_init(struct tdb_context *tdb); @@ -456,23 +502,31 @@ int tdb_lock_free_bucket(struct tdb_context *tdb, tdb_off_t b_off, enum tdb_lock_flags waitflag); void tdb_unlock_free_bucket(struct tdb_context *tdb, tdb_off_t b_off); -/* Do we have any locks? */ -bool tdb_has_locks(struct tdb_context *tdb); +/* Serialize transaction start. */ +int tdb_transaction_lock(struct tdb_context *tdb, int ltype); +int tdb_transaction_unlock(struct tdb_context *tdb, int ltype); + +/* Do we have any hash locks (ie. via tdb_chainlock) ? */ +bool tdb_has_hash_locks(struct tdb_context *tdb); /* Lock entire database. */ int tdb_allrecord_lock(struct tdb_context *tdb, int ltype, enum tdb_lock_flags flags, bool upgradable); int tdb_allrecord_unlock(struct tdb_context *tdb, int ltype); +int tdb_allrecord_upgrade(struct tdb_context *tdb); /* Serialize db open. */ -int tdb_lock_open(struct tdb_context *tdb); +int tdb_lock_open(struct tdb_context *tdb, enum tdb_lock_flags flags); void tdb_unlock_open(struct tdb_context *tdb); +bool tdb_has_open_lock(struct tdb_context *tdb); /* Serialize db expand. */ int tdb_lock_expand(struct tdb_context *tdb, int ltype); void tdb_unlock_expand(struct tdb_context *tdb, int ltype); bool tdb_has_expansion_lock(struct tdb_context *tdb); +/* If it needs recovery, grab all the locks and do it. */ +int tdb_lock_and_recover(struct tdb_context *tdb); /* traverse.c: */ int first_in_hash(struct tdb_context *tdb, int ltype, @@ -482,59 +536,15 @@ int next_in_hash(struct tdb_context *tdb, int ltype, struct traverse_info *tinfo, TDB_DATA *kbuf, size_t *dlen); - -#if 0 -/* Low-level locking primitives. */ -int tdb_nest_lock(struct tdb_context *tdb, tdb_off_t offset, int ltype, - enum tdb_lock_flags flags); -int tdb_nest_unlock(struct tdb_context *tdb, tdb_off_t offset, int ltype); - -int tdb_munmap(struct tdb_context *tdb); -void tdb_mmap(struct tdb_context *tdb); -int tdb_lock(struct tdb_context *tdb, int list, int ltype); -int tdb_lock_nonblock(struct tdb_context *tdb, int list, int ltype); -bool tdb_have_locks(struct tdb_context *tdb); -int tdb_unlock(struct tdb_context *tdb, int list, int ltype); -int tdb_brlock(struct tdb_context *tdb, - int rw_type, tdb_off_t offset, size_t len, - enum tdb_lock_flags flags); -int tdb_brunlock(struct tdb_context *tdb, - int rw_type, tdb_off_t offset, size_t len); -bool tdb_have_extra_locks(struct tdb_context *tdb); -void tdb_release_extra_locks(struct tdb_context *tdb); -int tdb_transaction_lock(struct tdb_context *tdb, int ltype); -int tdb_transaction_unlock(struct tdb_context *tdb, int ltype); -int tdb_allrecord_lock(struct tdb_context *tdb, int ltype, - enum tdb_lock_flags flags, bool upgradable); -int tdb_allrecord_unlock(struct tdb_context *tdb, int ltype); -int tdb_allrecord_upgrade(struct tdb_context *tdb); -int tdb_write_lock_record(struct tdb_context *tdb, tdb_off_t off); -int tdb_write_unlock_record(struct tdb_context *tdb, tdb_off_t off); -int tdb_ofs_read(struct tdb_context *tdb, tdb_off_t offset, tdb_off_t *d); -int tdb_ofs_write(struct tdb_context *tdb, tdb_off_t offset, tdb_off_t *d); -int tdb_free(struct tdb_context *tdb, tdb_off_t offset, struct tdb_record *rec); -tdb_off_t tdb_allocate(struct tdb_context *tdb, tdb_len_t length, struct tdb_record *rec); -int tdb_ofs_read(struct tdb_context *tdb, tdb_off_t offset, tdb_off_t *d); -int tdb_ofs_write(struct tdb_context *tdb, tdb_off_t offset, tdb_off_t *d); -int tdb_lock_record(struct tdb_context *tdb, tdb_off_t off); -int tdb_unlock_record(struct tdb_context *tdb, tdb_off_t off); +/* transaction.c: */ +int tdb_transaction_recover(struct tdb_context *tdb); bool tdb_needs_recovery(struct tdb_context *tdb); -int tdb_rec_read(struct tdb_context *tdb, tdb_off_t offset, struct tdb_record *rec); -int tdb_rec_write(struct tdb_context *tdb, tdb_off_t offset, struct tdb_record *rec); -int tdb_do_delete(struct tdb_context *tdb, tdb_off_t rec_ptr, struct tdb_record *rec); -unsigned char *tdb_alloc_read(struct tdb_context *tdb, tdb_off_t offset, tdb_len_t len); -int tdb_parse_data(struct tdb_context *tdb, TDB_DATA key, - tdb_off_t offset, tdb_len_t len, - int (*parser)(TDB_DATA key, TDB_DATA data, - void *private_data), - void *private_data); -tdb_off_t tdb_find_lock_hash(struct tdb_context *tdb, TDB_DATA key, uint32_t hash, int locktype, - struct tdb_record *rec); -void tdb_io_init(struct tdb_context *tdb); -int tdb_expand(struct tdb_context *tdb, tdb_off_t size); -int tdb_rec_free_read(struct tdb_context *tdb, tdb_off_t off, - struct tdb_record *rec); -#endif + +/* tdb.c: */ +void COLD tdb_logerr(struct tdb_context *tdb, + enum TDB_ERROR ecode, + enum tdb_debug_level level, + const char *fmt, ...); #ifdef TDB_TRACE void tdb_trace(struct tdb_context *tdb, const char *op);