X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftdb2%2Fprivate.h;h=213e83615a33cc00090175badb2b05e1c3aca24e;hp=b709ee95b97375845a06814998b37a5b711bbfb1;hb=5c4a21ab03a428373e7659b9606facf85dcbe17b;hpb=2960e90f2d036935273d163593839d3777be7980 diff --git a/ccan/tdb2/private.h b/ccan/tdb2/private.h index b709ee95..213e8361 100644 --- a/ccan/tdb2/private.h +++ b/ccan/tdb2/private.h @@ -19,6 +19,9 @@ */ #include "config.h" +#if HAVE_FILE_OFFSET_BITS +#define _FILE_OFFSET_BITS 64 +#endif #include #include #include @@ -75,7 +78,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 +92,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 @@ -246,7 +249,9 @@ struct tdb_header { uint64_t features_used; /* Features all writers understand */ uint64_t features_offered; /* Features offered */ - tdb_off_t reserved[24]; + uint64_t seqnum; /* Sequence number for TDB_SEQNUM */ + + tdb_off_t reserved[23]; /* Top level hash table. */ tdb_off_t hashtable[1ULL << TDB_TOPLEVEL_HASH_BITS]; @@ -320,6 +325,9 @@ struct tdb_file { /* Single list of all TDBs, to detect multiple opens. */ struct tdb_file *next; + /* How many are sharing us? */ + unsigned int refcnt; + /* Mmap (if any), or malloc (for TDB_INTERNAL). */ void *map_ptr; @@ -330,6 +338,7 @@ struct tdb_file { int fd; /* Lock information */ + pid_t locker; struct tdb_lock allrecord_lock; size_t num_lockrecs; struct tdb_lock *lockrecs; @@ -352,24 +361,26 @@ struct tdb_context { /* 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. */ 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; + /* 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; + /* Set if we are in a transaction. */ struct tdb_transaction *transaction; @@ -380,11 +391,15 @@ struct tdb_context { /* IO methods: changes for transactions. */ const struct tdb_methods *methods; - struct tdb_attribute_stats *stats; + /* Our statistics. */ + struct tdb_attribute_stats stats; /* 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; }; @@ -403,8 +418,6 @@ struct tdb_methods { 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); @@ -452,7 +465,8 @@ 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, - 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); /* Set up header for a used/ftable/htable/chain record. */ enum TDB_ERROR set_header(struct tdb_context *tdb, @@ -520,13 +534,8 @@ enum TDB_ERROR tdb_write_convert(struct tdb_context *tdb, tdb_off_t off, enum TDB_ERROR 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) +/* Bump the seqnum (caller checks for tdb->flags & TDB_SEQNUM) */ +void tdb_inc_seqnum(struct tdb_context *tdb); /* lock.c: */ /* Lock/unlock a range of hashes. */ @@ -538,7 +547,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, @@ -572,6 +581,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); +/* 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);