/* 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))
/* 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
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];
TDB_LOCK_NOCHECK = 4,
};
-struct tdb_lock_type {
+struct tdb_lock {
+ struct tdb_context *owner;
uint32_t off;
uint32_t count;
uint32_t ltype;
/* Single list of all TDBs, to detect multiple opens. */
struct tdb_file *next;
- /* The file descriptor. */
+ /* How many are sharing us? */
+ unsigned int refcnt;
+
+ /* Mmap (if any), or malloc (for TDB_INTERNAL). */
+ void *map_ptr;
+
+ /* How much space has been mapped (<= current file size) */
+ tdb_len_t map_size;
+
+ /* The file descriptor (-1 for TDB_INTERNAL). */
int fd;
/* Lock information */
- struct tdb_lock_type allrecord_lock;
+ pid_t locker;
+ struct tdb_lock allrecord_lock;
size_t num_lockrecs;
- struct tdb_lock_type *lockrecs;
+ struct tdb_lock *lockrecs;
/* Identity of this file. */
dev_t device;
/* Filename of the database. */
const char *name;
- /* 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;
-
/* Operating read-only? (Opened O_RDONLY, or in traverse_read) */
bool read_only;
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,
+ void *data,
+ const char *message);
+ 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;
/* Set if we are in a transaction. */
/* 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;
};
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. */
enum TDB_ERROR tdb_read_convert(struct tdb_context *tdb, tdb_off_t off,
void *rec, size_t len);
+/* Bump the seqnum (caller checks for tdb->flags & TDB_SEQNUM) */
+void tdb_inc_seqnum(struct tdb_context *tdb);
+
/* 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) \
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);