X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftdb2%2Fprivate.h;h=213e83615a33cc00090175badb2b05e1c3aca24e;hp=8e7df501b716a139c77e8de2ff673fe1afa55266;hb=5c4a21ab03a428373e7659b9606facf85dcbe17b;hpb=2b5cb9bd6be4e61870ba7a400d1a9d91c5933371 diff --git a/ccan/tdb2/private.h b/ccan/tdb2/private.h index 8e7df501..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]; @@ -300,7 +305,8 @@ enum tdb_lock_flags { TDB_LOCK_NOCHECK = 4, }; -struct tdb_lock_type { +struct tdb_lock { + struct tdb_context *owner; uint32_t off; uint32_t count; uint32_t ltype; @@ -315,21 +321,39 @@ struct tdb_access_hdr { bool convert; }; -struct tdb_context { - /* Filename of the database. */ - const char *name; +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; - /* Are we accessing directly? (debugging check). */ - int direct_access; + /* How much space has been mapped (<= current file size) */ + tdb_len_t map_size; - /* Open file descriptor (undefined for TDB_INTERNAL). */ + /* The file descriptor (-1 for TDB_INTERNAL). */ int fd; - /* How much space has been mapped (<= current file size) */ - tdb_len_t map_size; + /* Lock information */ + pid_t locker; + struct tdb_lock allrecord_lock; + size_t num_lockrecs; + struct tdb_lock *lockrecs; + + /* Identity of this file. */ + dev_t device; + ino_t inode; +}; + +struct tdb_context { + /* Filename of the database. */ + const char *name; + + /* Are we accessing directly? (debugging check). */ + int direct_access; /* Operating read-only? (Opened O_RDONLY, or in traverse_read) */ bool read_only; @@ -337,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; @@ -365,20 +391,17 @@ struct tdb_context { /* IO methods: changes for transactions. */ const struct tdb_methods *methods; - /* Lock information */ - struct tdb_lock_type allrecord_lock; - size_t num_lockrecs; - struct tdb_lock_type *lockrecs; - - struct tdb_attribute_stats *stats; + /* Our statistics. */ + struct tdb_attribute_stats stats; /* Direct access information */ struct tdb_access_hdr *access; - /* Single list of all TDBs, to avoid multiple opens. */ - struct tdb_context *next; - dev_t device; - ino_t inode; + /* Last error we returned. */ + enum TDB_ERROR last_error; + + /* The actual file information */ + struct tdb_file *file; }; struct tdb_methods { @@ -395,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); @@ -444,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, @@ -467,7 +489,7 @@ void tdb_io_init(struct tdb_context *tdb); void *tdb_convert(const struct tdb_context *tdb, void *buf, tdb_len_t size); /* Unmap and try to map the tdb. */ -void tdb_munmap(struct tdb_context *tdb); +void tdb_munmap(struct tdb_file *file); void tdb_mmap(struct tdb_context *tdb); /* Either alloc a copy, or give direct access. Release frees or noop. */ @@ -512,17 +534,10 @@ 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: */ -void tdb_lock_init(struct tdb_context *tdb); - /* Lock/unlock a range of hashes. */ enum TDB_ERROR tdb_lock_hashes(struct tdb_context *tdb, tdb_off_t hash_lock, tdb_len_t hash_range, @@ -531,6 +546,9 @@ enum TDB_ERROR tdb_unlock_hashes(struct tdb_context *tdb, tdb_off_t hash_lock, tdb_len_t hash_range, int ltype); +/* For closing the file. */ +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, enum tdb_lock_flags waitflag); @@ -563,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);