X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftdb2%2Ftdb.c;h=a7aa4572382b0f8b10ef03c4adc08599fd7e7293;hp=231ae7df5d92a8be10a1defe05ef10bb8b09b1fd;hb=98c754ffe65bc335f66161d6cc8705d4ea2710ec;hpb=7607ced7aea9b24a62efcd97b5d79c1214a2b2c6 diff --git a/ccan/tdb2/tdb.c b/ccan/tdb2/tdb.c index 231ae7df..a7aa4572 100644 --- a/ccan/tdb2/tdb.c +++ b/ccan/tdb2/tdb.c @@ -1,759 +1,135 @@ + /* + Trivial Database 2: fetch, store and misc routines. + Copyright (C) Rusty Russell 2010 + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 3 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, see . +*/ #include "private.h" -#include -#include -#include -#include -#include - -/* The null return. */ -struct tdb_data tdb_null = { .dptr = NULL, .dsize = 0 }; - -/* all contexts, to ensure no double-opens (fcntl locks don't nest!) */ -static struct tdb_context *tdbs = NULL; - -PRINTF_ATTRIBUTE(4, 5) static void -null_log_fn(struct tdb_context *tdb, - enum tdb_debug_level level, void *priv, - const char *fmt, ...) -{ -} - -/* We do a lot of work assuming our copy of the header volatile area - * is uptodate, and usually it is. However, once we grab a lock, we have to - * re-check it. */ -bool header_changed(struct tdb_context *tdb) -{ - uint64_t gen; - - if (!(tdb->flags & TDB_NOLOCK) && tdb->header_uptodate) { - tdb->log(tdb, TDB_DEBUG_WARNING, tdb->log_priv, - "warning: header uptodate already\n"); - } - - /* We could get a partial update if we're not holding any locks. */ - assert((tdb->flags & TDB_NOLOCK) || tdb_has_locks(tdb)); - - tdb->header_uptodate = true; - gen = tdb_read_off(tdb, offsetof(struct tdb_header, v.generation)); - if (unlikely(gen != tdb->header.v.generation)) { - tdb_read_convert(tdb, offsetof(struct tdb_header, v), - &tdb->header.v, sizeof(tdb->header.v)); - return true; - } - return false; -} - -int write_header(struct tdb_context *tdb) -{ - assert(tdb_read_off(tdb, offsetof(struct tdb_header, v.generation)) - == tdb->header.v.generation); - tdb->header.v.generation++; - return tdb_write_convert(tdb, offsetof(struct tdb_header, v), - &tdb->header.v, sizeof(tdb->header.v)); -} - -static uint64_t jenkins_hash(const void *key, size_t length, uint64_t seed, - void *arg) +#include +#include + +static enum TDB_ERROR update_rec_hdr(struct tdb_context *tdb, + tdb_off_t off, + tdb_len_t keylen, + tdb_len_t datalen, + struct tdb_used_record *rec, + uint64_t h) { - return hash64_stable((const unsigned char *)key, length, seed); -} - -uint64_t tdb_hash(struct tdb_context *tdb, const void *ptr, size_t len) -{ - return tdb->khash(ptr, len, tdb->header.hash_seed, tdb->hash_priv); -} - -static bool tdb_already_open(dev_t device, ino_t ino) -{ - struct tdb_context *i; - - for (i = tdbs; i; i = i->next) { - if (i->device == device && i->inode == ino) { - return true; - } - } - - return false; -} - -static uint64_t random_number(struct tdb_context *tdb) -{ - int fd; - uint64_t ret = 0; - struct timeval now; - - fd = open("/dev/urandom", O_RDONLY); - if (fd >= 0) { - if (tdb_read_all(fd, &ret, sizeof(ret))) { - tdb->log(tdb, TDB_DEBUG_TRACE, tdb->log_priv, - "tdb_open: random from /dev/urandom\n"); - close(fd); - return ret; - } - close(fd); - } - /* FIXME: Untested! Based on Wikipedia protocol description! */ - fd = open("/dev/egd-pool", O_RDWR); - if (fd >= 0) { - /* Command is 1, next byte is size we want to read. */ - char cmd[2] = { 1, sizeof(uint64_t) }; - if (write(fd, cmd, sizeof(cmd)) == sizeof(cmd)) { - char reply[1 + sizeof(uint64_t)]; - int r = read(fd, reply, sizeof(reply)); - if (r > 1) { - tdb->log(tdb, TDB_DEBUG_TRACE, tdb->log_priv, - "tdb_open: %u random bytes from" - " /dev/egd-pool\n", r-1); - /* Copy at least some bytes. */ - memcpy(&ret, reply+1, r - 1); - if (reply[0] == sizeof(uint64_t) - && r == sizeof(reply)) { - close(fd); - return ret; - } - } - } - close(fd); - } - - /* Fallback: pid and time. */ - gettimeofday(&now, NULL); - ret = getpid() * 100132289ULL + now.tv_sec * 1000000ULL + now.tv_usec; - tdb->log(tdb, TDB_DEBUG_TRACE, tdb->log_priv, - "tdb_open: random from getpid and time\n"); - return ret; -} - -struct new_database { - struct tdb_header hdr; - struct tdb_used_record hrec; - tdb_off_t hash[1ULL << INITIAL_HASH_BITS]; - struct tdb_used_record frec; - tdb_off_t free[INITIAL_FREE_BUCKETS + 1]; /* One overflow bucket */ -}; - -/* initialise a new database */ -static int tdb_new_database(struct tdb_context *tdb) -{ - /* We make it up in memory, then write it out if not internal */ - struct new_database newdb; - unsigned int magic_off = offsetof(struct tdb_header, magic_food); - - /* Fill in the header */ - newdb.hdr.version = TDB_VERSION; - newdb.hdr.hash_seed = random_number(tdb); - newdb.hdr.hash_test = TDB_HASH_MAGIC; - newdb.hdr.hash_test = tdb->khash(&newdb.hdr.hash_test, - sizeof(newdb.hdr.hash_test), - newdb.hdr.hash_seed, - tdb->hash_priv); - - newdb.hdr.v.generation = 0; - - /* The initial zone must cover the initial database size! */ - BUILD_ASSERT((1ULL << INITIAL_ZONE_BITS) >= sizeof(newdb)); - - /* Free array has 1 zone, 10 buckets. All buckets empty. */ - newdb.hdr.v.num_zones = 1; - newdb.hdr.v.zone_bits = INITIAL_ZONE_BITS; - newdb.hdr.v.free_buckets = INITIAL_FREE_BUCKETS; - newdb.hdr.v.free_off = offsetof(struct new_database, free); - set_header(tdb, &newdb.frec, 0, - sizeof(newdb.free), sizeof(newdb.free), 0); - memset(newdb.free, 0, sizeof(newdb.free)); - - /* Initial hashes are empty. */ - newdb.hdr.v.hash_bits = INITIAL_HASH_BITS; - newdb.hdr.v.hash_off = offsetof(struct new_database, hash); - set_header(tdb, &newdb.hrec, 0, - sizeof(newdb.hash), sizeof(newdb.hash), 0); - memset(newdb.hash, 0, sizeof(newdb.hash)); - - /* Magic food */ - memset(newdb.hdr.magic_food, 0, sizeof(newdb.hdr.magic_food)); - strcpy(newdb.hdr.magic_food, TDB_MAGIC_FOOD); - - /* This creates an endian-converted database, as if read from disk */ - tdb_convert(tdb, - (char *)&newdb.hdr + magic_off, - sizeof(newdb) - magic_off); - - tdb->header = newdb.hdr; - - if (tdb->flags & TDB_INTERNAL) { - tdb->map_size = sizeof(newdb); - tdb->map_ptr = malloc(tdb->map_size); - if (!tdb->map_ptr) { - tdb->ecode = TDB_ERR_OOM; - return -1; - } - memcpy(tdb->map_ptr, &newdb, tdb->map_size); - return 0; - } - if (lseek(tdb->fd, 0, SEEK_SET) == -1) - return -1; - - if (ftruncate(tdb->fd, 0) == -1) - return -1; + uint64_t dataroom = rec_data_length(rec) + rec_extra_padding(rec); + enum TDB_ERROR ecode; - if (!tdb_pwrite_all(tdb->fd, &newdb, sizeof(newdb), 0)) { - tdb->ecode = TDB_ERR_IO; - return -1; + ecode = set_header(tdb, rec, TDB_USED_MAGIC, keylen, datalen, + keylen + dataroom, h); + if (ecode == TDB_SUCCESS) { + ecode = tdb_write_convert(tdb, off, rec, sizeof(*rec)); } - return 0; + return ecode; } -struct tdb_context *tdb_open(const char *name, int tdb_flags, - int open_flags, mode_t mode, - union tdb_attribute *attr) +static enum TDB_ERROR replace_data(struct tdb_context *tdb, + struct hash_info *h, + struct tdb_data key, struct tdb_data dbuf, + tdb_off_t old_off, tdb_len_t old_room, + bool growing) { - struct tdb_context *tdb; - struct stat st; - int save_errno; - uint64_t hash_test; - unsigned v; - - tdb = malloc(sizeof(*tdb)); - if (!tdb) { - /* Can't log this */ - errno = ENOMEM; - goto fail; - } - tdb->name = NULL; - tdb->map_ptr = NULL; - tdb->fd = -1; - /* map_size will be set below. */ - tdb->ecode = TDB_SUCCESS; - /* header will be read in below. */ - tdb->header_uptodate = false; - tdb->flags = tdb_flags; - tdb->log = null_log_fn; - tdb->log_priv = NULL; - tdb->khash = jenkins_hash; - tdb->hash_priv = NULL; - tdb->transaction = NULL; - /* last_zone will be set below. */ - tdb_io_init(tdb); - tdb_lock_init(tdb); - - while (attr) { - switch (attr->base.attr) { - case TDB_ATTRIBUTE_LOG: - tdb->log = attr->log.log_fn; - tdb->log_priv = attr->log.log_private; - break; - case TDB_ATTRIBUTE_HASH: - tdb->khash = attr->hash.hash_fn; - tdb->hash_priv = attr->hash.hash_private; - break; - default: - tdb->log(tdb, TDB_DEBUG_ERROR, tdb->log_priv, - "tdb_open: unknown attribute type %u\n", - attr->base.attr); - errno = EINVAL; - goto fail; - } - attr = attr->base.next; - } - - if ((open_flags & O_ACCMODE) == O_WRONLY) { - tdb->log(tdb, TDB_DEBUG_ERROR, tdb->log_priv, - "tdb_open: can't open tdb %s write-only\n", name); - errno = EINVAL; - goto fail; - } - - if ((open_flags & O_ACCMODE) == O_RDONLY) { - tdb->read_only = true; - /* read only databases don't do locking */ - tdb->flags |= TDB_NOLOCK; - } else - tdb->read_only = false; - - /* internal databases don't need any of the rest. */ - if (tdb->flags & TDB_INTERNAL) { - tdb->flags |= (TDB_NOLOCK | TDB_NOMMAP); - if (tdb_new_database(tdb) != 0) { - tdb->log(tdb, TDB_DEBUG_ERROR, tdb->log_priv, - "tdb_open: tdb_new_database failed!"); - goto fail; - } - TEST_IT(tdb->flags & TDB_CONVERT); - tdb_convert(tdb, &tdb->header, sizeof(tdb->header)); - /* Zones don't matter for internal db. */ - tdb->last_zone = 0; - return tdb; - } - - if ((tdb->fd = open(name, open_flags, mode)) == -1) { - tdb->log(tdb, TDB_DEBUG_WARNING, tdb->log_priv, - "tdb_open: could not open file %s: %s\n", - name, strerror(errno)); - goto fail; /* errno set by open(2) */ - } - - /* on exec, don't inherit the fd */ - v = fcntl(tdb->fd, F_GETFD, 0); - fcntl(tdb->fd, F_SETFD, v | FD_CLOEXEC); - - /* ensure there is only one process initialising at once */ - if (tdb_lock_open(tdb) == -1) { - tdb->log(tdb, TDB_DEBUG_ERROR, tdb->log_priv, - "tdb_open: failed to get open lock on %s: %s\n", - name, strerror(errno)); - goto fail; /* errno set by tdb_brlock */ - } - - if (!tdb_pread_all(tdb->fd, &tdb->header, sizeof(tdb->header), 0) - || strcmp(tdb->header.magic_food, TDB_MAGIC_FOOD) != 0) { - if (!(open_flags & O_CREAT) || tdb_new_database(tdb) == -1) { - if (errno == 0) { - errno = EIO; /* ie bad format or something */ - } - goto fail; - } - } else if (tdb->header.version != TDB_VERSION) { - if (tdb->header.version == bswap_64(TDB_VERSION)) - tdb->flags |= TDB_CONVERT; - else { - /* wrong version */ - tdb->log(tdb, TDB_DEBUG_ERROR, tdb->log_priv, - "tdb_open: %s is unknown version 0x%llx\n", - name, (long long)tdb->header.version); - errno = EIO; - goto fail; - } - } - - tdb_convert(tdb, &tdb->header, sizeof(tdb->header)); - hash_test = TDB_HASH_MAGIC; - hash_test = tdb->khash(&hash_test, sizeof(hash_test), - tdb->header.hash_seed, tdb->hash_priv); - if (tdb->header.hash_test != hash_test) { - /* wrong hash variant */ - tdb->log(tdb, TDB_DEBUG_ERROR, tdb->log_priv, - "tdb_open: %s uses a different hash function\n", - name); - errno = EIO; - goto fail; - } - - if (fstat(tdb->fd, &st) == -1) - goto fail; - - /* Is it already in the open list? If so, fail. */ - if (tdb_already_open(st.st_dev, st.st_ino)) { - /* FIXME */ - tdb->log(tdb, TDB_DEBUG_ERROR, tdb->log_priv, - "tdb_open: %s (%d,%d) is already open in this process\n", - name, (int)st.st_dev, (int)st.st_ino); - errno = EBUSY; - goto fail; - } + tdb_off_t new_off; + enum TDB_ERROR ecode; - tdb->name = strdup(name); - if (!tdb->name) { - errno = ENOMEM; - goto fail; + /* Allocate a new record. */ + new_off = alloc(tdb, key.dsize, dbuf.dsize, h->h, TDB_USED_MAGIC, + growing); + if (TDB_OFF_IS_ERR(new_off)) { + return new_off; } - tdb->map_size = st.st_size; - tdb->device = st.st_dev; - tdb->inode = st.st_ino; - tdb_mmap(tdb); - tdb_unlock_open(tdb); - tdb_zone_init(tdb); - - tdb->next = tdbs; - tdbs = tdb; - return tdb; - - fail: - save_errno = errno; - - if (!tdb) - return NULL; - -#ifdef TDB_TRACE - close(tdb->tracefd); -#endif - if (tdb->map_ptr) { - if (tdb->flags & TDB_INTERNAL) { - free(tdb->map_ptr); - } else - tdb_munmap(tdb); + /* We didn't like the existing one: remove it. */ + if (old_off) { + tdb->stats.frees++; + ecode = add_free_record(tdb, old_off, + sizeof(struct tdb_used_record) + + key.dsize + old_room, + TDB_LOCK_WAIT, true); + if (ecode == TDB_SUCCESS) + ecode = replace_in_hash(tdb, h, new_off); + } else { + ecode = add_to_hash(tdb, h, new_off); } - free((char *)tdb->name); - if (tdb->fd != -1) - if (close(tdb->fd) != 0) - tdb->log(tdb, TDB_DEBUG_ERROR, tdb->log_priv, - "tdb_open: failed to close tdb->fd" - " on error!\n"); - free(tdb); - errno = save_errno; - return NULL; -} - -static tdb_off_t hash_off(struct tdb_context *tdb, uint64_t list) -{ - return tdb->header.v.hash_off - + ((list & ((1ULL << tdb->header.v.hash_bits) - 1)) - * sizeof(tdb_off_t)); -} - -/* Returns 0 if the entry is a zero (definitely not a match). - * Returns a valid entry offset if it's a match. Fills in rec. - * Otherwise returns TDB_OFF_ERR: keep searching. */ -static tdb_off_t entry_matches(struct tdb_context *tdb, - uint64_t list, - uint64_t hash, - const struct tdb_data *key, - struct tdb_used_record *rec) -{ - tdb_off_t off; - uint64_t keylen; - const unsigned char *rkey; - - list &= ((1ULL << tdb->header.v.hash_bits) - 1); - - off = tdb_read_off(tdb, tdb->header.v.hash_off - + list * sizeof(tdb_off_t)); - if (off == 0 || off == TDB_OFF_ERR) - return off; - -#if 0 /* FIXME: Check other bits. */ - unsigned int bits, bitmask, hoffextra; - /* Bottom three bits show how many extra hash bits. */ - bits = (off & ((1 << TDB_EXTRA_HASHBITS_NUM) - 1)) + 1; - bitmask = (1 << bits)-1; - hoffextra = ((off >> TDB_EXTRA_HASHBITS_NUM) & bitmask); - uint64_t hextra = hash >> tdb->header.v.hash_bits; - if ((hextra & bitmask) != hoffextra) - return TDB_OFF_ERR; - off &= ~...; -#endif - - if (tdb_read_convert(tdb, off, rec, sizeof(*rec)) == -1) - return TDB_OFF_ERR; - - /* FIXME: check extra bits in header! */ - keylen = rec_key_length(rec); - if (keylen != key->dsize) - return TDB_OFF_ERR; - - rkey = tdb_access_read(tdb, off + sizeof(*rec), keylen, false); - if (!rkey) - return TDB_OFF_ERR; - if (memcmp(rkey, key->dptr, keylen) != 0) - off = TDB_OFF_ERR; - tdb_access_release(tdb, rkey); - return off; -} - -/* FIXME: Optimize? */ -static void unlock_lists(struct tdb_context *tdb, - tdb_off_t list, tdb_len_t num, - int ltype) -{ - tdb_off_t i; - - for (i = list; i < list + num; i++) - tdb_unlock_list(tdb, i, ltype); -} - -/* FIXME: Optimize? */ -static int lock_lists(struct tdb_context *tdb, - tdb_off_t list, tdb_len_t num, - int ltype) -{ - tdb_off_t i; - - for (i = list; i < list + num; i++) { - if (tdb_lock_list(tdb, i, ltype, TDB_LOCK_WAIT) - == TDB_OFF_ERR) { - unlock_lists(tdb, list, i - list, ltype); - return -1; - } + if (ecode != TDB_SUCCESS) { + return ecode; } - return 0; -} - -/* We lock hashes up to the next empty offset. We already hold the - * lock on the start bucket, but we may need to release and re-grab - * it. If we fail, we hold no locks at all! */ -static tdb_len_t relock_hash_to_zero(struct tdb_context *tdb, - tdb_off_t start, int ltype) -{ - tdb_len_t num, len; - -again: - num = 1ULL << tdb->header.v.hash_bits; - len = tdb_find_zero_off(tdb, hash_off(tdb, start), num - start); - if (unlikely(len == num - start)) { - /* We hit the end of the hash range. Drop lock: we have - to lock start of hash first. */ - tdb_len_t pre_locks; - - tdb_unlock_list(tdb, start, ltype); - - /* Grab something, so header is stable. */ - if (tdb_lock_list(tdb, 0, ltype, TDB_LOCK_WAIT)) - return TDB_OFF_ERR; - pre_locks = tdb_find_zero_off(tdb, hash_off(tdb, 0), num); - /* We want to lock the zero entry as well. */ - pre_locks++; - if (lock_lists(tdb, 1, pre_locks - 1, ltype) == -1) { - tdb_unlock_list(tdb, 0, ltype); - return TDB_OFF_ERR; - } - /* Now lock later ones. */ - if (unlikely(lock_lists(tdb, start, len, ltype) == -1)) { - unlock_lists(tdb, 0, pre_locks, ltype); - return TDB_OFF_ERR; - } - len += pre_locks; - } else { - /* We want to lock the zero entry as well. */ - len++; - /* But we already have lock on start. */ - if (unlikely(lock_lists(tdb, start+1, len-1, ltype) == -1)) { - tdb_unlock_list(tdb, start, ltype); - return TDB_OFF_ERR; - } + new_off += sizeof(struct tdb_used_record); + ecode = tdb->tdb2.io->twrite(tdb, new_off, key.dptr, key.dsize); + if (ecode != TDB_SUCCESS) { + return ecode; } - /* Now, did we lose the race, and it's not zero any more? */ - if (unlikely(tdb_read_off(tdb, hash_off(tdb, start + len - 1)) != 0)) { - /* Leave the start locked, as expected. */ - unlock_lists(tdb, start + 1, len - 1, ltype); - goto again; + new_off += key.dsize; + ecode = tdb->tdb2.io->twrite(tdb, new_off, dbuf.dptr, dbuf.dsize); + if (ecode != TDB_SUCCESS) { + return ecode; } - return len; -} - -/* FIXME: modify, don't rewrite! */ -static int update_rec_hdr(struct tdb_context *tdb, - tdb_off_t off, - tdb_len_t keylen, - tdb_len_t datalen, - struct tdb_used_record *rec, - uint64_t h) -{ - uint64_t dataroom = rec_data_length(rec) + rec_extra_padding(rec); - - if (set_header(tdb, rec, keylen, datalen, keylen + dataroom, h)) - return -1; + if (tdb->flags & TDB_SEQNUM) + tdb_inc_seqnum(tdb); - return tdb_write_convert(tdb, off, rec, sizeof(*rec)); -} - -static int hash_add(struct tdb_context *tdb, - uint64_t hash, tdb_off_t off) -{ - tdb_off_t i, hoff, len, num; - - /* Look for next space. */ - i = (hash & ((1ULL << tdb->header.v.hash_bits) - 1)); - len = (1ULL << tdb->header.v.hash_bits) - i; - num = tdb_find_zero_off(tdb, hash_off(tdb, i), len); - - if (unlikely(num == len)) { - /* We wrapped. Look through start of hash table. */ - hoff = hash_off(tdb, 0); - len = (1ULL << tdb->header.v.hash_bits); - num = tdb_find_zero_off(tdb, hoff, len); - if (i == len) { - tdb->ecode = TDB_ERR_CORRUPT; - tdb->log(tdb, TDB_DEBUG_FATAL, tdb->log_priv, - "hash_add: full hash table!\n"); - return -1; - } - } - /* FIXME: Encode extra hash bits! */ - return tdb_write_off(tdb, hash_off(tdb, i + num), off); + return TDB_SUCCESS; } -/* If we fail, others will try after us. */ -static void enlarge_hash(struct tdb_context *tdb) +static enum TDB_ERROR update_data(struct tdb_context *tdb, + tdb_off_t off, + struct tdb_data dbuf, + tdb_len_t extra) { - tdb_off_t newoff, oldoff, i; - tdb_len_t hlen; - uint64_t num = 1ULL << tdb->header.v.hash_bits; - struct tdb_used_record pad, *r; - - /* FIXME: We should do this without holding locks throughout. */ - if (tdb_allrecord_lock(tdb, F_WRLCK, TDB_LOCK_WAIT, false) == -1) - return; - - /* Someone else enlarged for us? Nothing to do. */ - if ((1ULL << tdb->header.v.hash_bits) != num) - goto unlock; - -again: - /* Allocate our new array. */ - hlen = num * sizeof(tdb_off_t) * 2; - newoff = alloc(tdb, 0, hlen, 0, false); - if (unlikely(newoff == TDB_OFF_ERR)) - goto unlock; - if (unlikely(newoff == 0)) { - if (tdb_expand(tdb, 0, hlen, false) == -1) - goto unlock; - goto again; - } - /* Step over record header! */ - newoff += sizeof(struct tdb_used_record); - - /* Starts all zero. */ - if (zero_out(tdb, newoff, hlen) == -1) - goto unlock; - - /* Update header now so we can use normal routines. */ - oldoff = tdb->header.v.hash_off; - - tdb->header.v.hash_bits++; - tdb->header.v.hash_off = newoff; + enum TDB_ERROR ecode; - /* FIXME: If the space before is empty, we know this is in its ideal - * location. Or steal a bit from the pointer to avoid rehash. */ - for (i = 0; i < num; i++) { - tdb_off_t off; - off = tdb_read_off(tdb, oldoff + i * sizeof(tdb_off_t)); - if (unlikely(off == TDB_OFF_ERR)) - goto oldheader; - if (off && hash_add(tdb, hash_record(tdb, off), off) == -1) - goto oldheader; + ecode = tdb->tdb2.io->twrite(tdb, off, dbuf.dptr, dbuf.dsize); + if (ecode == TDB_SUCCESS && extra) { + /* Put a zero in; future versions may append other data. */ + ecode = tdb->tdb2.io->twrite(tdb, off + dbuf.dsize, "", 1); } + if (tdb->flags & TDB_SEQNUM) + tdb_inc_seqnum(tdb); - /* Free up old hash. */ - r = tdb_get(tdb, oldoff - sizeof(*r), &pad, sizeof(*r)); - if (!r) - goto oldheader; - add_free_record(tdb, oldoff - sizeof(*r), - sizeof(*r)+rec_data_length(r)+rec_extra_padding(r)); - - /* Now we write the modified header. */ - write_header(tdb); -unlock: - tdb_allrecord_unlock(tdb, F_WRLCK); - return; - -oldheader: - tdb->header.v.hash_bits--; - tdb->header.v.hash_off = oldoff; - goto unlock; + return ecode; } -/* This is the core routine which searches the hashtable for an entry. - * On error, no locks are held and TDB_OFF_ERR is returned. - * Otherwise, *num_locks locks of type ltype from *start_lock are held. - * The bucket where the entry is (or would be) is in *bucket. - * If not found, the return value is 0. - * If found, the return value is the offset, and *rec is the record. */ -static tdb_off_t find_and_lock(struct tdb_context *tdb, - struct tdb_data key, - uint64_t h, - int ltype, - tdb_off_t *start_lock, - tdb_len_t *num_locks, - tdb_off_t *bucket, - struct tdb_used_record *rec) +enum TDB_ERROR tdb_store(struct tdb_context *tdb, + struct tdb_data key, struct tdb_data dbuf, int flag) { + struct hash_info h; tdb_off_t off; + tdb_len_t old_room = 0; + struct tdb_used_record rec; + enum TDB_ERROR ecode; - /* FIXME: can we avoid locks for some fast paths? */ - *start_lock = tdb_lock_list(tdb, h, ltype, TDB_LOCK_WAIT); - if (*start_lock == TDB_OFF_ERR) - return TDB_OFF_ERR; - - /* Fast path. */ - off = entry_matches(tdb, *start_lock, h, &key, rec); - if (likely(off != TDB_OFF_ERR)) { - *bucket = *start_lock; - *num_locks = 1; - return off; + if (tdb->flags & TDB_VERSION1) { + if (tdb1_store(tdb, key, dbuf, flag) == -1) + return tdb->last_error; + return TDB_SUCCESS; } - /* Slow path, need to grab more locks and search. */ - - /* Warning: this may drop the lock on *bucket! */ - *num_locks = relock_hash_to_zero(tdb, *start_lock, ltype); - if (*num_locks == TDB_OFF_ERR) - return TDB_OFF_ERR; - - for (*bucket = *start_lock; - *bucket < *start_lock + *num_locks; - (*bucket)++) { - off = entry_matches(tdb, *bucket, h, &key, rec); - /* Empty entry or we found it? */ - if (off == 0 || off != TDB_OFF_ERR) - return off; + off = find_and_lock(tdb, key, F_WRLCK, &h, &rec, NULL); + if (TDB_OFF_IS_ERR(off)) { + return tdb->last_error = off; } - /* We didn't find a zero entry? Something went badly wrong... */ - unlock_lists(tdb, *start_lock, *start_lock + *num_locks, ltype); - tdb->ecode = TDB_ERR_CORRUPT; - tdb->log(tdb, TDB_DEBUG_FATAL, tdb->log_priv, - "find_and_lock: expected to find an empty hash bucket!\n"); - return TDB_OFF_ERR; -} - -/* Returns -1 on error, 0 on OK, 1 on "expand and retry." */ -static int replace_data(struct tdb_context *tdb, - uint64_t h, struct tdb_data key, struct tdb_data dbuf, - tdb_off_t bucket, - tdb_off_t old_off, tdb_len_t old_room, - bool growing) -{ - tdb_off_t new_off; - - /* Allocate a new record. */ - new_off = alloc(tdb, key.dsize, dbuf.dsize, h, growing); - if (new_off == 0) - return 1; - - /* We didn't like the existing one: remove it. */ - if (old_off) - add_free_record(tdb, old_off, - sizeof(struct tdb_used_record) - + key.dsize + old_room); - - /* FIXME: Encode extra hash bits! */ - if (tdb_write_off(tdb, hash_off(tdb, bucket), new_off) == -1) - return -1; - - new_off += sizeof(struct tdb_used_record); - if (tdb->methods->write(tdb, new_off, key.dptr, key.dsize) == -1) - return -1; - - new_off += key.dsize; - if (tdb->methods->write(tdb, new_off, dbuf.dptr, dbuf.dsize) == -1) - return -1; - - /* FIXME: tdb_increment_seqnum(tdb); */ - return 0; -} - -int tdb_store(struct tdb_context *tdb, - struct tdb_data key, struct tdb_data dbuf, int flag) -{ - tdb_off_t off, bucket, start, num; - tdb_len_t old_room = 0; - struct tdb_used_record rec; - uint64_t h; - int ret; - - h = tdb_hash(tdb, key.dptr, key.dsize); - off = find_and_lock(tdb, key, h, F_WRLCK, &start, &num, &bucket, &rec); - if (unlikely(off == TDB_OFF_ERR)) - return -1; - /* Now we have lock on this hash bucket. */ if (flag == TDB_INSERT) { if (off) { - tdb->ecode = TDB_ERR_EXISTS; - goto fail; + ecode = TDB_ERR_EXISTS; + goto out; } } else { if (off) { @@ -761,67 +137,56 @@ int tdb_store(struct tdb_context *tdb, + rec_extra_padding(&rec); if (old_room >= dbuf.dsize) { /* Can modify in-place. Easy! */ - if (update_rec_hdr(tdb, off, - key.dsize, dbuf.dsize, - &rec, h)) - goto fail; - if (tdb->methods->write(tdb, off + sizeof(rec) - + key.dsize, - dbuf.dptr, dbuf.dsize)) - goto fail; - unlock_lists(tdb, start, num, F_WRLCK); - return 0; + ecode = update_rec_hdr(tdb, off, + key.dsize, dbuf.dsize, + &rec, h.h); + if (ecode != TDB_SUCCESS) { + goto out; + } + ecode = update_data(tdb, + off + sizeof(rec) + + key.dsize, dbuf, + old_room - dbuf.dsize); + if (ecode != TDB_SUCCESS) { + goto out; + } + tdb_unlock_hashes(tdb, h.hlock_start, + h.hlock_range, F_WRLCK); + return tdb->last_error = TDB_SUCCESS; } - /* FIXME: See if right record is free? */ } else { if (flag == TDB_MODIFY) { /* if the record doesn't exist and we are in TDB_MODIFY mode then we should fail the store */ - tdb->ecode = TDB_ERR_NOEXIST; - goto fail; + ecode = TDB_ERR_NOEXIST; + goto out; } } } /* If we didn't use the old record, this implies we're growing. */ - ret = replace_data(tdb, h, key, dbuf, bucket, off, old_room, off != 0); - unlock_lists(tdb, start, num, F_WRLCK); - - if (unlikely(ret == 1)) { - /* Expand, then try again... */ - if (tdb_expand(tdb, key.dsize, dbuf.dsize, off != 0) == -1) - return -1; - return tdb_store(tdb, key, dbuf, flag); - } - - /* FIXME: by simple simulation, this approximated 60% full. - * Check in real case! */ - if (unlikely(num > 4 * tdb->header.v.hash_bits - 30)) - enlarge_hash(tdb); - - return ret; - -fail: - unlock_lists(tdb, start, num, F_WRLCK); - return -1; + ecode = replace_data(tdb, &h, key, dbuf, off, old_room, off); +out: + tdb_unlock_hashes(tdb, h.hlock_start, h.hlock_range, F_WRLCK); + return tdb->last_error = ecode; } -int tdb_append(struct tdb_context *tdb, - struct tdb_data key, struct tdb_data dbuf) +enum TDB_ERROR tdb_append(struct tdb_context *tdb, + struct tdb_data key, struct tdb_data dbuf) { - tdb_off_t off, bucket, start, num; + struct hash_info h; + tdb_off_t off; struct tdb_used_record rec; tdb_len_t old_room = 0, old_dlen; - uint64_t h; unsigned char *newdata; struct tdb_data new_dbuf; - int ret; + enum TDB_ERROR ecode; - h = tdb_hash(tdb, key.dptr, key.dsize); - off = find_and_lock(tdb, key, h, F_WRLCK, &start, &num, &bucket, &rec); - if (unlikely(off == TDB_OFF_ERR)) - return -1; + off = find_and_lock(tdb, key, F_WRLCK, &h, &rec, NULL); + if (TDB_OFF_IS_ERR(off)) { + return tdb->last_error = off; + } if (off) { old_dlen = rec_data_length(&rec); @@ -829,34 +194,33 @@ int tdb_append(struct tdb_context *tdb, /* Fast path: can append in place. */ if (rec_extra_padding(&rec) >= dbuf.dsize) { - if (update_rec_hdr(tdb, off, key.dsize, - old_dlen + dbuf.dsize, &rec, h)) - goto fail; + ecode = update_rec_hdr(tdb, off, key.dsize, + old_dlen + dbuf.dsize, &rec, + h.h); + if (ecode != TDB_SUCCESS) { + goto out; + } off += sizeof(rec) + key.dsize + old_dlen; - if (tdb->methods->write(tdb, off, dbuf.dptr, - dbuf.dsize) == -1) - goto fail; - - /* FIXME: tdb_increment_seqnum(tdb); */ - unlock_lists(tdb, start, num, F_WRLCK); - return 0; + ecode = update_data(tdb, off, dbuf, + rec_extra_padding(&rec)); + goto out; } - /* FIXME: Check right record free? */ /* Slow path. */ newdata = malloc(key.dsize + old_dlen + dbuf.dsize); if (!newdata) { - tdb->ecode = TDB_ERR_OOM; - tdb->log(tdb, TDB_DEBUG_FATAL, tdb->log_priv, - "tdb_append: cannot allocate %llu bytes!\n", - (long long)key.dsize + old_dlen + dbuf.dsize); - goto fail; + ecode = tdb_logerr(tdb, TDB_ERR_OOM, TDB_LOG_ERROR, + "tdb_append:" + " failed to allocate %zu bytes", + (size_t)(key.dsize + old_dlen + + dbuf.dsize)); + goto out; } - if (tdb->methods->read(tdb, off + sizeof(rec) + key.dsize, - newdata, old_dlen) != 0) { - free(newdata); - goto fail; + ecode = tdb->tdb2.io->tread(tdb, off + sizeof(rec) + key.dsize, + newdata, old_dlen); + if (ecode != TDB_SUCCESS) { + goto out_free_newdata; } memcpy(newdata + old_dlen, dbuf.dptr, dbuf.dsize); new_dbuf.dptr = newdata; @@ -867,163 +231,324 @@ int tdb_append(struct tdb_context *tdb, } /* If they're using tdb_append(), it implies they're growing record. */ - ret = replace_data(tdb, h, key, new_dbuf, bucket, off, old_room, true); - unlock_lists(tdb, start, num, F_WRLCK); + ecode = replace_data(tdb, &h, key, new_dbuf, off, old_room, true); + +out_free_newdata: free(newdata); +out: + tdb_unlock_hashes(tdb, h.hlock_start, h.hlock_range, F_WRLCK); + return tdb->last_error = ecode; +} - if (unlikely(ret == 1)) { - /* Expand, then try again. */ - if (tdb_expand(tdb, key.dsize, dbuf.dsize, true) == -1) - return -1; - return tdb_append(tdb, key, dbuf); - } +enum TDB_ERROR tdb_fetch(struct tdb_context *tdb, struct tdb_data key, + struct tdb_data *data) +{ + tdb_off_t off; + struct tdb_used_record rec; + struct hash_info h; + enum TDB_ERROR ecode; - /* FIXME: by simple simulation, this approximated 60% full. - * Check in real case! */ - if (unlikely(num > 4 * tdb->header.v.hash_bits - 30)) - enlarge_hash(tdb); + off = find_and_lock(tdb, key, F_RDLCK, &h, &rec, NULL); + if (TDB_OFF_IS_ERR(off)) { + return tdb->last_error = off; + } - return 0; + if (!off) { + ecode = TDB_ERR_NOEXIST; + } else { + data->dsize = rec_data_length(&rec); + data->dptr = tdb_alloc_read(tdb, off + sizeof(rec) + key.dsize, + data->dsize); + if (TDB_PTR_IS_ERR(data->dptr)) { + ecode = TDB_PTR_ERR(data->dptr); + } else + ecode = TDB_SUCCESS; + } -fail: - unlock_lists(tdb, start, num, F_WRLCK); - return -1; + tdb_unlock_hashes(tdb, h.hlock_start, h.hlock_range, F_RDLCK); + return tdb->last_error = ecode; } -struct tdb_data tdb_fetch(struct tdb_context *tdb, struct tdb_data key) +bool tdb_exists(struct tdb_context *tdb, TDB_DATA key) { - tdb_off_t off, start, num, bucket; + tdb_off_t off; struct tdb_used_record rec; - uint64_t h; - struct tdb_data ret; - - h = tdb_hash(tdb, key.dptr, key.dsize); - off = find_and_lock(tdb, key, h, F_RDLCK, &start, &num, &bucket, &rec); - if (unlikely(off == TDB_OFF_ERR)) - return tdb_null; + struct hash_info h; - if (!off) { - tdb->ecode = TDB_ERR_NOEXIST; - ret = tdb_null; - } else { - ret.dsize = rec_data_length(&rec); - ret.dptr = tdb_alloc_read(tdb, off + sizeof(rec) + key.dsize, - ret.dsize); + off = find_and_lock(tdb, key, F_RDLCK, &h, &rec, NULL); + if (TDB_OFF_IS_ERR(off)) { + tdb->last_error = off; + return false; } + tdb_unlock_hashes(tdb, h.hlock_start, h.hlock_range, F_RDLCK); - unlock_lists(tdb, start, num, F_RDLCK); - return ret; + tdb->last_error = TDB_SUCCESS; + return off ? true : false; } -int tdb_delete(struct tdb_context *tdb, struct tdb_data key) +enum TDB_ERROR tdb_delete(struct tdb_context *tdb, struct tdb_data key) { - tdb_off_t i, bucket, off, start, num; + tdb_off_t off; struct tdb_used_record rec; - uint64_t h; + struct hash_info h; + enum TDB_ERROR ecode; - h = tdb_hash(tdb, key.dptr, key.dsize); - off = find_and_lock(tdb, key, h, F_WRLCK, &start, &num, &bucket, &rec); - if (unlikely(off == TDB_OFF_ERR)) - return -1; + off = find_and_lock(tdb, key, F_WRLCK, &h, &rec, NULL); + if (TDB_OFF_IS_ERR(off)) { + return tdb->last_error = off; + } if (!off) { - unlock_lists(tdb, start, num, F_WRLCK); - tdb->ecode = TDB_ERR_NOEXIST; - return -1; + ecode = TDB_ERR_NOEXIST; + goto unlock; } - /* This actually unlinks it. */ - if (tdb_write_off(tdb, hash_off(tdb, bucket), 0) == -1) - goto unlock_err; + ecode = delete_from_hash(tdb, &h); + if (ecode != TDB_SUCCESS) { + goto unlock; + } - /* Rehash anything following. */ - for (i = hash_off(tdb, bucket+1); - i != hash_off(tdb, h + num - 1); - i += sizeof(tdb_off_t)) { - tdb_off_t off2; - uint64_t h2; + /* Free the deleted entry. */ + tdb->stats.frees++; + ecode = add_free_record(tdb, off, + sizeof(struct tdb_used_record) + + rec_key_length(&rec) + + rec_data_length(&rec) + + rec_extra_padding(&rec), + TDB_LOCK_WAIT, true); - off2 = tdb_read_off(tdb, i); - if (unlikely(off2 == TDB_OFF_ERR)) - goto unlock_err; + if (tdb->flags & TDB_SEQNUM) + tdb_inc_seqnum(tdb); - /* This can happen if we raced. */ - if (unlikely(off2 == 0)) - break; +unlock: + tdb_unlock_hashes(tdb, h.hlock_start, h.hlock_range, F_WRLCK); + return tdb->last_error = ecode; +} - /* Maybe use a bit to indicate it is in ideal place? */ - h2 = hash_record(tdb, off2); - /* Is it happy where it is? */ - if (hash_off(tdb, h2) == i) - continue; +unsigned int tdb_get_flags(struct tdb_context *tdb) +{ + return tdb->flags; +} - /* Remove it. */ - if (tdb_write_off(tdb, i, 0) == -1) - goto unlock_err; +static bool inside_transaction(const struct tdb_context *tdb) +{ + if (tdb->flags & TDB_VERSION1) + return tdb->tdb1.transaction != NULL; + else + return tdb->tdb2.transaction != NULL; +} - /* Rehash it. */ - if (hash_add(tdb, h2, off2) == -1) - goto unlock_err; - } +static bool readonly_changable(struct tdb_context *tdb, const char *caller) +{ + if (inside_transaction(tdb)) { + tdb->last_error = tdb_logerr(tdb, TDB_ERR_EINVAL, + TDB_LOG_USE_ERROR, + "%s: can't change" + " TDB_RDONLY inside transaction", + caller); + return false; + } + + if (tdb->file->allrecord_lock.count != 0 + || tdb->file->num_lockrecs != 0) { + tdb->last_error = tdb_logerr(tdb, TDB_ERR_EINVAL, + TDB_LOG_USE_ERROR, + "%s: can't change" + " TDB_RDONLY holding locks", + caller); + return false; + } + return true; +} - /* Free the deleted entry. */ - if (add_free_record(tdb, off, - sizeof(struct tdb_used_record) - + rec_key_length(&rec) - + rec_data_length(&rec) - + rec_extra_padding(&rec)) != 0) - goto unlock_err; +void tdb_add_flag(struct tdb_context *tdb, unsigned flag) +{ + if (tdb->flags & TDB_INTERNAL) { + tdb->last_error = tdb_logerr(tdb, TDB_ERR_EINVAL, + TDB_LOG_USE_ERROR, + "tdb_add_flag: internal db"); + return; + } + switch (flag) { + case TDB_NOLOCK: + tdb->flags |= TDB_NOLOCK; + break; + case TDB_NOMMAP: + tdb->flags |= TDB_NOMMAP; + tdb_munmap(tdb->file); + break; + case TDB_NOSYNC: + tdb->flags |= TDB_NOSYNC; + break; + case TDB_SEQNUM: + tdb->flags |= TDB_SEQNUM; + break; + case TDB_ALLOW_NESTING: + tdb->flags |= TDB_ALLOW_NESTING; + break; + case TDB_RDONLY: + if (readonly_changable(tdb, "tdb_add_flag")) + tdb->flags |= TDB_RDONLY; + break; + default: + tdb->last_error = tdb_logerr(tdb, TDB_ERR_EINVAL, + TDB_LOG_USE_ERROR, + "tdb_add_flag: Unknown flag %u", + flag); + } +} - unlock_lists(tdb, start, num, F_WRLCK); - return 0; +void tdb_remove_flag(struct tdb_context *tdb, unsigned flag) +{ + if (tdb->flags & TDB_INTERNAL) { + tdb->last_error = tdb_logerr(tdb, TDB_ERR_EINVAL, + TDB_LOG_USE_ERROR, + "tdb_remove_flag: internal db"); + return; + } + switch (flag) { + case TDB_NOLOCK: + tdb->flags &= ~TDB_NOLOCK; + break; + case TDB_NOMMAP: + tdb->flags &= ~TDB_NOMMAP; + tdb_mmap(tdb); + break; + case TDB_NOSYNC: + tdb->flags &= ~TDB_NOSYNC; + break; + case TDB_SEQNUM: + tdb->flags &= ~TDB_SEQNUM; + break; + case TDB_ALLOW_NESTING: + tdb->flags &= ~TDB_ALLOW_NESTING; + break; + case TDB_RDONLY: + if ((tdb->open_flags & O_ACCMODE) == O_RDONLY) { + tdb->last_error = tdb_logerr(tdb, TDB_ERR_EINVAL, + TDB_LOG_USE_ERROR, + "tdb_remove_flag: can't" + " remove TDB_RDONLY on tdb" + " opened with O_RDONLY"); + break; + } + if (readonly_changable(tdb, "tdb_remove_flag")) + tdb->flags &= ~TDB_RDONLY; + break; + default: + tdb->last_error = tdb_logerr(tdb, TDB_ERR_EINVAL, + TDB_LOG_USE_ERROR, + "tdb_remove_flag: Unknown flag %u", + flag); + } +} -unlock_err: - unlock_lists(tdb, start, num, F_WRLCK); - return -1; +const char *tdb_errorstr(enum TDB_ERROR ecode) +{ + /* Gcc warns if you miss a case in the switch, so use that. */ + switch (ecode) { + case TDB_SUCCESS: return "Success"; + case TDB_ERR_CORRUPT: return "Corrupt database"; + case TDB_ERR_IO: return "IO Error"; + case TDB_ERR_LOCK: return "Locking error"; + case TDB_ERR_OOM: return "Out of memory"; + case TDB_ERR_EXISTS: return "Record exists"; + case TDB_ERR_EINVAL: return "Invalid parameter"; + case TDB_ERR_NOEXIST: return "Record does not exist"; + case TDB_ERR_RDONLY: return "write not permitted"; + } + return "Invalid error code"; } -int tdb_close(struct tdb_context *tdb) +enum TDB_ERROR tdb_error(struct tdb_context *tdb) { - struct tdb_context **i; - int ret = 0; + return tdb->last_error; +} - /* FIXME: - if (tdb->transaction) { - tdb_transaction_cancel(tdb); +enum TDB_ERROR COLD tdb_logerr(struct tdb_context *tdb, + enum TDB_ERROR ecode, + enum tdb_log_level level, + const char *fmt, ...) +{ + char *message; + va_list ap; + size_t len; + /* tdb_open paths care about errno, so save it. */ + int saved_errno = errno; + + if (!tdb->log_fn) + return ecode; + + va_start(ap, fmt); + len = vasprintf(&message, fmt, ap); + va_end(ap); + + if (len < 0) { + tdb->log_fn(tdb, TDB_LOG_ERROR, TDB_ERR_OOM, + "out of memory formatting message:", tdb->log_data); + tdb->log_fn(tdb, level, ecode, fmt, tdb->log_data); + } else { + tdb->log_fn(tdb, level, ecode, message, tdb->log_data); + free(message); } - */ - tdb_trace(tdb, "tdb_close"); + errno = saved_errno; + return ecode; +} - if (tdb->map_ptr) { - if (tdb->flags & TDB_INTERNAL) - free(tdb->map_ptr); - else - tdb_munmap(tdb); - } - free((char *)tdb->name); - if (tdb->fd != -1) { - ret = close(tdb->fd); - tdb->fd = -1; +enum TDB_ERROR tdb_parse_record_(struct tdb_context *tdb, + TDB_DATA key, + enum TDB_ERROR (*parse)(TDB_DATA k, + TDB_DATA d, + void *data), + void *data) +{ + tdb_off_t off; + struct tdb_used_record rec; + struct hash_info h; + enum TDB_ERROR ecode; + + off = find_and_lock(tdb, key, F_RDLCK, &h, &rec, NULL); + if (TDB_OFF_IS_ERR(off)) { + return tdb->last_error = off; } - free(tdb->lockrecs); - /* Remove from contexts list */ - for (i = &tdbs; *i; i = &(*i)->next) { - if (*i == tdb) { - *i = tdb->next; - break; + if (!off) { + ecode = TDB_ERR_NOEXIST; + } else { + const void *dptr; + dptr = tdb_access_read(tdb, off + sizeof(rec) + key.dsize, + rec_data_length(&rec), false); + if (TDB_PTR_IS_ERR(dptr)) { + ecode = TDB_PTR_ERR(dptr); + } else { + TDB_DATA d = tdb_mkdata(dptr, rec_data_length(&rec)); + + ecode = parse(key, d, data); + tdb_access_release(tdb, dptr); } } -#ifdef TDB_TRACE - close(tdb->tracefd); -#endif - free(tdb); + tdb_unlock_hashes(tdb, h.hlock_start, h.hlock_range, F_RDLCK); + return tdb->last_error = ecode; +} - return ret; +const char *tdb_name(const struct tdb_context *tdb) +{ + return tdb->name; } -enum TDB_ERROR tdb_error(struct tdb_context *tdb) +int64_t tdb_get_seqnum(struct tdb_context *tdb) +{ + tdb_off_t off = tdb_read_off(tdb, offsetof(struct tdb_header, seqnum)); + if (TDB_OFF_IS_ERR(off)) + tdb->last_error = off; + else + tdb->last_error = TDB_SUCCESS; + return off; +} + + +int tdb_fd(const struct tdb_context *tdb) { - return tdb->ecode; + return tdb->file->fd; }