X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftdb2%2Ftdb.c;h=58a62cb400da905dba1fbae3845ed4a0d1f47dbe;hp=c0561fb9fe1f2511797aa5604d368721a3a57f61;hb=587982955ca9c61363d6e3004622ee97eda80e4b;hpb=d70577b6aff24ccf6815896509dabb8c9ac07904 diff --git a/ccan/tdb2/tdb.c b/ccan/tdb2/tdb.c index c0561fb9..58a62cb4 100644 --- a/ccan/tdb2/tdb.c +++ b/ccan/tdb2/tdb.c @@ -1,8 +1,7 @@ #include "private.h" #include -#include -#include #include +#include /* The null return. */ struct tdb_data tdb_null = { .dptr = NULL, .dsize = 0 }; @@ -10,13 +9,6 @@ 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_FMT(4, 5) static void -null_log_fn(struct tdb_context *tdb, - enum tdb_debug_level level, void *priv, - const char *fmt, ...) -{ -} - static bool tdb_already_open(dev_t device, ino_t ino) { struct tdb_context *i; @@ -30,6 +22,24 @@ static bool tdb_already_open(dev_t device, ino_t ino) return false; } +static bool read_all(int fd, void *buf, size_t len) +{ + while (len) { + ssize_t ret; + ret = read(fd, buf, len); + if (ret < 0) + return false; + if (ret == 0) { + /* ETOOSHORT? */ + errno = EWOULDBLOCK; + return false; + } + buf = (char *)buf + ret; + len -= ret; + } + return true; +} + static uint64_t random_number(struct tdb_context *tdb) { int fd; @@ -38,9 +48,7 @@ static uint64_t random_number(struct tdb_context *tdb) 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"); + if (read_all(fd, &ret, sizeof(ret))) { close(fd); return ret; } @@ -55,9 +63,6 @@ static uint64_t random_number(struct tdb_context *tdb) 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) @@ -73,14 +78,14 @@ static uint64_t random_number(struct tdb_context *tdb) /* 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"); + tdb_logerr(tdb, TDB_SUCCESS, TDB_LOG_WARNING, + "tdb_open: random from getpid and time"); return ret; } struct new_database { struct tdb_header hdr; - struct tdb_freelist flist; + struct tdb_freetable ftable; }; /* initialise a new database */ @@ -91,6 +96,7 @@ 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_len; + ssize_t rlen; /* Fill in the header */ newdb.hdr.version = TDB_VERSION; @@ -103,15 +109,17 @@ static int tdb_new_database(struct tdb_context *tdb, sizeof(newdb.hdr.hash_test), newdb.hdr.hash_seed, tdb->hash_priv); + newdb.hdr.recovery = 0; memset(newdb.hdr.reserved, 0, sizeof(newdb.hdr.reserved)); /* Initial hashes are empty. */ memset(newdb.hdr.hashtable, 0, sizeof(newdb.hdr.hashtable)); /* Free is empty. */ - newdb.hdr.free_list = offsetof(struct new_database, flist); - memset(&newdb.flist, 0, sizeof(newdb.flist)); - set_header(NULL, &newdb.flist.hdr, 0, - sizeof(newdb.flist.buckets), sizeof(newdb.flist.buckets), 1); + newdb.hdr.free_table = offsetof(struct new_database, ftable); + memset(&newdb.ftable, 0, sizeof(newdb.ftable)); + set_header(NULL, &newdb.ftable.hdr, TDB_FTABLE_MAGIC, 0, + sizeof(newdb.ftable) - sizeof(newdb.ftable.hdr), + sizeof(newdb.ftable) - sizeof(newdb.ftable.hdr), 0); /* Magic food */ memset(newdb.hdr.magic_food, 0, sizeof(newdb.hdr.magic_food)); @@ -128,7 +136,8 @@ static int tdb_new_database(struct tdb_context *tdb, tdb->map_size = sizeof(newdb); tdb->map_ptr = malloc(tdb->map_size); if (!tdb->map_ptr) { - tdb->ecode = TDB_ERR_OOM; + tdb_logerr(tdb, TDB_ERR_OOM, TDB_LOG_ERROR, + "tdb_new_database: failed to allocate"); return -1; } memcpy(tdb->map_ptr, &newdb, tdb->map_size); @@ -140,8 +149,13 @@ static int tdb_new_database(struct tdb_context *tdb, if (ftruncate(tdb->fd, 0) == -1) return -1; - if (!tdb_pwrite_all(tdb->fd, &newdb, sizeof(newdb), 0)) { - tdb->ecode = TDB_ERR_IO; + rlen = write(tdb->fd, &newdb, sizeof(newdb)); + if (rlen != sizeof(newdb)) { + if (rlen >= 0) + errno = ENOSPC; + tdb_logerr(tdb, TDB_ERR_IO, TDB_LOG_ERROR, + "tdb_new_database: %zi writing header: %s", + rlen, strerror(errno)); return -1; } return 0; @@ -153,9 +167,10 @@ struct tdb_context *tdb_open(const char *name, int tdb_flags, { struct tdb_context *tdb; struct stat st; - int save_errno; + int saved_errno = 0; uint64_t hash_test; unsigned v; + ssize_t rlen; struct tdb_header hdr; struct tdb_attribute_seed *seed = NULL; @@ -163,7 +178,7 @@ struct tdb_context *tdb_open(const char *name, int tdb_flags, if (!tdb) { /* Can't log this */ errno = ENOMEM; - goto fail; + return NULL; } tdb->name = NULL; tdb->map_ptr = NULL; @@ -172,9 +187,10 @@ struct tdb_context *tdb_open(const char *name, int tdb_flags, tdb->map_size = sizeof(struct tdb_header); tdb->ecode = TDB_SUCCESS; tdb->flags = tdb_flags; - tdb->log = null_log_fn; - tdb->log_priv = NULL; + tdb->logfn = NULL; tdb->transaction = NULL; + tdb->stats = NULL; + tdb->access = NULL; tdb_hash_init(tdb); tdb_io_init(tdb); tdb_lock_init(tdb); @@ -182,8 +198,8 @@ struct tdb_context *tdb_open(const char *name, int tdb_flags, while (attr) { switch (attr->base.attr) { case TDB_ATTRIBUTE_LOG: - tdb->log = attr->log.log_fn; - tdb->log_priv = attr->log.log_private; + tdb->logfn = attr->log.log_fn; + tdb->log_private = attr->log.log_private; break; case TDB_ATTRIBUTE_HASH: tdb->khash = attr->hash.hash_fn; @@ -192,20 +208,24 @@ struct tdb_context *tdb_open(const char *name, int tdb_flags, case TDB_ATTRIBUTE_SEED: seed = &attr->seed; break; + case TDB_ATTRIBUTE_STATS: + tdb->stats = &attr->stats; + /* They have stats we don't know about? Tell them. */ + if (tdb->stats->size > sizeof(attr->stats)) + tdb->stats->size = sizeof(attr->stats); + break; default: - tdb->log(tdb, TDB_DEBUG_ERROR, tdb->log_priv, - "tdb_open: unknown attribute type %u\n", - attr->base.attr); - errno = EINVAL; + tdb_logerr(tdb, TDB_ERR_EINVAL, TDB_LOG_USE_ERROR, + "tdb_open: unknown attribute type %u", + attr->base.attr); 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; + tdb_logerr(tdb, TDB_ERR_EINVAL, TDB_LOG_USE_ERROR, + "tdb_open: can't open tdb %s write-only", name); goto fail; } @@ -223,21 +243,21 @@ struct tdb_context *tdb_open(const char *name, int tdb_flags, if (tdb->flags & TDB_INTERNAL) { tdb->flags |= (TDB_NOLOCK | TDB_NOMMAP); if (tdb_new_database(tdb, seed, &hdr) != 0) { - tdb->log(tdb, TDB_DEBUG_ERROR, tdb->log_priv, - "tdb_open: tdb_new_database failed!"); goto fail; } tdb_convert(tdb, &hdr.hash_seed, sizeof(hdr.hash_seed)); tdb->hash_seed = hdr.hash_seed; - tdb_flist_init(tdb); + tdb_ftable_init(tdb); 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) */ + /* errno set by open(2) */ + saved_errno = errno; + tdb_logerr(tdb, TDB_ERR_IO, TDB_LOG_ERROR, + "tdb_open: could not open file %s: %s", + name, strerror(errno)); + goto fail; } /* on exec, don't inherit the fd */ @@ -245,31 +265,38 @@ struct tdb_context *tdb_open(const char *name, int tdb_flags, 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, &hdr, sizeof(hdr), 0) - || strcmp(hdr.magic_food, TDB_MAGIC_FOOD) != 0) { - if (!(open_flags & O_CREAT) - || tdb_new_database(tdb, seed, &hdr) == -1) { - if (errno == 0) { - errno = EIO; /* ie bad format or something */ - } + if (tdb_lock_open(tdb, TDB_LOCK_WAIT|TDB_LOCK_NOCHECK) == -1) { + /* errno set by tdb_brlock */ + saved_errno = errno; + goto fail; + } + + /* If they used O_TRUNC, read will return 0. */ + rlen = read(tdb->fd, &hdr, sizeof(hdr)); + if (rlen == 0 && (open_flags & O_CREAT)) { + if (tdb_new_database(tdb, seed, &hdr) == -1) { goto fail; } - } else if (hdr.version != TDB_VERSION) { + } else if (rlen < 0) { + tdb_logerr(tdb, TDB_ERR_IO, TDB_LOG_ERROR, + "tdb_open: error %s reading %s", + strerror(errno), name); + goto fail; + } else if (rlen < sizeof(hdr) + || strcmp(hdr.magic_food, TDB_MAGIC_FOOD) != 0) { + tdb_logerr(tdb, TDB_ERR_IO, TDB_LOG_ERROR, + "tdb_open: %s is not a tdb file", name); + goto fail; + } + + if (hdr.version != TDB_VERSION) { if (hdr.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)hdr.version); - errno = EIO; + tdb_logerr(tdb, TDB_ERR_IO, TDB_LOG_ERROR, + "tdb_open: %s is unknown version 0x%llx", + name, (long long)hdr.version); goto fail; } } @@ -280,29 +307,34 @@ struct tdb_context *tdb_open(const char *name, int tdb_flags, hash_test = tdb_hash(tdb, &hash_test, sizeof(hash_test)); if (hdr.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; + tdb_logerr(tdb, TDB_ERR_IO, TDB_LOG_ERROR, + "tdb_open: %s uses a different hash function", + name); goto fail; } - if (fstat(tdb->fd, &st) == -1) + if (fstat(tdb->fd, &st) == -1) { + saved_errno = errno; + tdb_logerr(tdb, TDB_ERR_IO, TDB_LOG_ERROR, + "tdb_open: could not stat open %s: %s", + name, strerror(errno)); 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; + tdb_logerr(tdb, TDB_ERR_NESTING, TDB_LOG_USE_ERROR, + "tdb_open: %s (%d,%d) is already open in this" + " process", + name, (int)st.st_dev, (int)st.st_ino); goto fail; } tdb->name = strdup(name); if (!tdb->name) { - errno = ENOMEM; + tdb_logerr(tdb, TDB_ERR_OOM, TDB_LOG_ERROR, + "tdb_open: failed to allocate name"); goto fail; } @@ -313,7 +345,12 @@ struct tdb_context *tdb_open(const char *name, int tdb_flags, /* This make sure we have current map_size and mmap. */ tdb->methods->oob(tdb, tdb->map_size + 1, true); - if (tdb_flist_init(tdb) == -1) + /* Now it's fully formed, recover if necessary. */ + if (tdb_needs_recovery(tdb) && tdb_lock_and_recover(tdb) == -1) { + goto fail; + } + + if (tdb_ftable_init(tdb) == -1) goto fail; tdb->next = tdbs; @@ -321,10 +358,30 @@ struct tdb_context *tdb_open(const char *name, int tdb_flags, return tdb; fail: - save_errno = errno; - - if (!tdb) - return NULL; + /* Map ecode to some logical errno. */ + if (!saved_errno) { + switch (tdb->ecode) { + case TDB_ERR_CORRUPT: + case TDB_ERR_IO: + saved_errno = EIO; + break; + case TDB_ERR_LOCK: + saved_errno = EWOULDBLOCK; + break; + case TDB_ERR_OOM: + saved_errno = ENOMEM; + break; + case TDB_ERR_EINVAL: + saved_errno = EINVAL; + break; + case TDB_ERR_NESTING: + saved_errno = EBUSY; + break; + default: + saved_errno = EINVAL; + break; + } + } #ifdef TDB_TRACE close(tdb->tracefd); @@ -335,18 +392,18 @@ struct tdb_context *tdb_open(const char *name, int tdb_flags, } else tdb_munmap(tdb); } + free(tdb->lockrecs); 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"); + tdb_logerr(tdb, TDB_ERR_IO, TDB_LOG_ERROR, + "tdb_open: failed to close tdb->fd" + " on error: %s", strerror(errno)); free(tdb); - errno = save_errno; + errno = saved_errno; return NULL; } -/* FIXME: modify, don't rewrite! */ static int update_rec_hdr(struct tdb_context *tdb, tdb_off_t off, tdb_len_t keylen, @@ -356,7 +413,8 @@ static int update_rec_hdr(struct tdb_context *tdb, { uint64_t dataroom = rec_data_length(rec) + rec_extra_padding(rec); - if (set_header(tdb, rec, keylen, datalen, keylen + dataroom, h)) + if (set_header(tdb, rec, TDB_USED_MAGIC, keylen, datalen, + keylen + dataroom, h)) return -1; return tdb_write_convert(tdb, off, rec, sizeof(*rec)); @@ -372,12 +430,14 @@ static int replace_data(struct tdb_context *tdb, tdb_off_t new_off; /* Allocate a new record. */ - new_off = alloc(tdb, key.dsize, dbuf.dsize, h->h, growing); + new_off = alloc(tdb, key.dsize, dbuf.dsize, h->h, TDB_USED_MAGIC, + growing); if (unlikely(new_off == TDB_OFF_ERR)) return -1; /* We didn't like the existing one: remove it. */ if (old_off) { + add_stat(tdb, frees, 1); add_free_record(tdb, old_off, sizeof(struct tdb_used_record) + key.dsize + old_room); @@ -389,11 +449,11 @@ static int replace_data(struct tdb_context *tdb, } new_off += sizeof(struct tdb_used_record); - if (tdb->methods->write(tdb, new_off, key.dptr, key.dsize) == -1) + if (tdb->methods->twrite(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) + if (tdb->methods->twrite(tdb, new_off, dbuf.dptr, dbuf.dsize) == -1) return -1; /* FIXME: tdb_increment_seqnum(tdb); */ @@ -429,15 +489,14 @@ int tdb_store(struct tdb_context *tdb, key.dsize, dbuf.dsize, &rec, h.h)) goto fail; - if (tdb->methods->write(tdb, off + sizeof(rec) - + key.dsize, - dbuf.dptr, dbuf.dsize)) + if (tdb->methods->twrite(tdb, off + sizeof(rec) + + key.dsize, + dbuf.dptr, dbuf.dsize)) goto fail; tdb_unlock_hashes(tdb, h.hlock_start, h.hlock_range, F_WRLCK); return 0; } - /* FIXME: See if right record is free? */ } else { if (flag == TDB_MODIFY) { /* if the record doesn't exist and we @@ -485,8 +544,8 @@ int tdb_append(struct tdb_context *tdb, goto fail; off += sizeof(rec) + key.dsize + old_dlen; - if (tdb->methods->write(tdb, off, dbuf.dptr, - dbuf.dsize) == -1) + if (tdb->methods->twrite(tdb, off, dbuf.dptr, + dbuf.dsize) == -1) goto fail; /* FIXME: tdb_increment_seqnum(tdb); */ @@ -494,19 +553,17 @@ int tdb_append(struct tdb_context *tdb, F_WRLCK); return 0; } - /* 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); + 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 fail; } - if (tdb->methods->read(tdb, off + sizeof(rec) + key.dsize, - newdata, old_dlen) != 0) { + if (tdb->methods->tread(tdb, off + sizeof(rec) + key.dsize, + newdata, old_dlen) != 0) { free(newdata); goto fail; } @@ -574,6 +631,7 @@ int tdb_delete(struct tdb_context *tdb, struct tdb_data key) goto unlock_err; /* Free the deleted entry. */ + add_stat(tdb, frees, 1); if (add_free_record(tdb, off, sizeof(struct tdb_used_record) + rec_key_length(&rec) @@ -594,12 +652,11 @@ int tdb_close(struct tdb_context *tdb) struct tdb_context **i; int ret = 0; - /* FIXME: + tdb_trace(tdb, "tdb_close"); + if (tdb->transaction) { tdb_transaction_cancel(tdb); } - */ - tdb_trace(tdb, "tdb_close"); if (tdb->map_ptr) { if (tdb->flags & TDB_INTERNAL) @@ -630,12 +687,12 @@ int tdb_close(struct tdb_context *tdb) return ret; } -enum TDB_ERROR tdb_error(struct tdb_context *tdb) +enum TDB_ERROR tdb_error(const struct tdb_context *tdb) { return tdb->ecode; } -const char *tdb_errorstr(struct tdb_context *tdb) +const char *tdb_errorstr(const struct tdb_context *tdb) { /* Gcc warns if you miss a case in the switch, so use that. */ switch (tdb->ecode) { @@ -652,3 +709,39 @@ const char *tdb_errorstr(struct tdb_context *tdb) } return "Invalid error code"; } + +void 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; + + tdb->ecode = ecode; + + if (!tdb->logfn) + return; + + /* FIXME: Doesn't assume asprintf. */ + va_start(ap, fmt); + len = vsnprintf(NULL, 0, fmt, ap); + va_end(ap); + + message = malloc(len + 1); + if (!message) { + tdb->logfn(tdb, TDB_LOG_ERROR, tdb->log_private, + "out of memory formatting message:"); + tdb->logfn(tdb, level, tdb->log_private, fmt); + return; + } + va_start(ap, fmt); + len = vsprintf(message, fmt, ap); + va_end(ap); + tdb->logfn(tdb, level, tdb->log_private, message); + free(message); + errno = saved_errno; +}