X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=ccan%2Ftdb2%2Ftdb.c;h=79c76b1991fe5eca77edfdad99ab8d07e3a79d15;hb=d1383862ad9a74e713dc915d351b74da4db35078;hp=659d39b23b1ccefc99060c76d6196fa6be77df8e;hpb=b846677c1ec77e986c7d6b7c913aa2a4b0c82d4e;p=ccan-lca-2011.git diff --git a/ccan/tdb2/tdb.c b/ccan/tdb2/tdb.c index 659d39b..79c76b1 100644 --- a/ccan/tdb2/tdb.c +++ b/ccan/tdb2/tdb.c @@ -10,7 +10,7 @@ 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 +PRINTF_FMT(4, 5) static void null_log_fn(struct tdb_context *tdb, enum tdb_debug_level level, void *priv, const char *fmt, ...) @@ -83,29 +83,23 @@ struct new_database { /* Initial free zone. */ struct free_zone_header zhdr; tdb_off_t free[BUCKETS_FOR_ZONE(INITIAL_ZONE_BITS) + 1]; - struct tdb_free_record frec; - /* Rest up to 1 << INITIAL_ZONE_BITS is empty. */ - char space[(1 << INITIAL_ZONE_BITS) - - sizeof(struct free_zone_header) - - sizeof(tdb_off_t) * (BUCKETS_FOR_ZONE(INITIAL_ZONE_BITS)+1) - - sizeof(struct tdb_free_record)]; - uint8_t tailer; - /* Don't count final padding! */ }; /* initialise a new database */ -static int tdb_new_database(struct tdb_context *tdb, struct tdb_header *hdr) +static int tdb_new_database(struct tdb_context *tdb, + struct tdb_attribute_seed *seed, + struct tdb_header *hdr) { /* We make it up in memory, then write it out if not internal */ struct new_database newdb; - unsigned int bucket, magic_len, dbsize; - - /* Don't want any extra padding! */ - dbsize = offsetof(struct new_database, tailer) + sizeof(newdb.tailer); + unsigned int magic_len; /* Fill in the header */ newdb.hdr.version = TDB_VERSION; - newdb.hdr.hash_seed = random_number(tdb); + if (seed) + newdb.hdr.hash_seed = seed->seed; + else + 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), @@ -115,27 +109,10 @@ static int tdb_new_database(struct tdb_context *tdb, struct tdb_header *hdr) /* Initial hashes are empty. */ memset(newdb.hdr.hashtable, 0, sizeof(newdb.hdr.hashtable)); - /* Free is mostly empty... */ + /* Free is empty. */ newdb.zhdr.zone_bits = INITIAL_ZONE_BITS; memset(newdb.free, 0, sizeof(newdb.free)); - /* Create the single free entry. */ - newdb.frec.magic_and_meta = TDB_FREE_MAGIC | INITIAL_ZONE_BITS; - newdb.frec.data_len = (sizeof(newdb.frec) - - sizeof(struct tdb_used_record) - + sizeof(newdb.space)); - - /* Add it to the correct bucket. */ - bucket = size_to_bucket(INITIAL_ZONE_BITS, newdb.frec.data_len); - newdb.free[bucket] = offsetof(struct new_database, frec); - newdb.frec.next = newdb.frec.prev = 0; - - /* Clear free space to keep valgrind happy, and avoid leaking stack. */ - memset(newdb.space, 0, sizeof(newdb.space)); - - /* Tailer contains maximum number of free_zone bits. */ - newdb.tailer = INITIAL_ZONE_BITS; - /* Magic food */ memset(newdb.hdr.magic_food, 0, sizeof(newdb.hdr.magic_food)); strcpy(newdb.hdr.magic_food, TDB_MAGIC_FOOD); @@ -143,13 +120,12 @@ static int tdb_new_database(struct tdb_context *tdb, struct tdb_header *hdr) /* This creates an endian-converted database, as if read from disk */ magic_len = sizeof(newdb.hdr.magic_food); tdb_convert(tdb, - (char *)&newdb.hdr + magic_len, - offsetof(struct new_database, space) - magic_len); + (char *)&newdb.hdr + magic_len, sizeof(newdb) - magic_len); *hdr = newdb.hdr; if (tdb->flags & TDB_INTERNAL) { - tdb->map_size = dbsize; + tdb->map_size = sizeof(newdb); tdb->map_ptr = malloc(tdb->map_size); if (!tdb->map_ptr) { tdb->ecode = TDB_ERR_OOM; @@ -164,7 +140,7 @@ static int tdb_new_database(struct tdb_context *tdb, struct tdb_header *hdr) if (ftruncate(tdb->fd, 0) == -1) return -1; - if (!tdb_pwrite_all(tdb->fd, &newdb, dbsize, 0)) { + if (!tdb_pwrite_all(tdb->fd, &newdb, sizeof(newdb), 0)) { tdb->ecode = TDB_ERR_IO; return -1; } @@ -181,6 +157,7 @@ struct tdb_context *tdb_open(const char *name, int tdb_flags, uint64_t hash_test; unsigned v; struct tdb_header hdr; + struct tdb_attribute_seed *seed = NULL; tdb = malloc(sizeof(*tdb)); if (!tdb) { @@ -213,6 +190,9 @@ struct tdb_context *tdb_open(const char *name, int tdb_flags, tdb->khash = attr->hash.hash_fn; tdb->hash_priv = attr->hash.hash_private; break; + case TDB_ATTRIBUTE_SEED: + seed = &attr->seed; + break; default: tdb->log(tdb, TDB_DEBUG_ERROR, tdb->log_priv, "tdb_open: unknown attribute type %u\n", @@ -243,7 +223,7 @@ struct tdb_context *tdb_open(const char *name, int tdb_flags, /* 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, &hdr) != 0) { + 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; @@ -275,7 +255,8 @@ struct tdb_context *tdb_open(const char *name, int tdb_flags, 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, &hdr) == -1) { + if (!(open_flags & O_CREAT) + || tdb_new_database(tdb, seed, &hdr) == -1) { if (errno == 0) { errno = EIO; /* ie bad format or something */ } @@ -432,7 +413,7 @@ int tdb_store(struct tdb_context *tdb, struct tdb_used_record rec; int ret; - off = find_and_lock(tdb, key, F_WRLCK, &h, &rec); + off = find_and_lock(tdb, key, F_WRLCK, &h, &rec, NULL); if (unlikely(off == TDB_OFF_ERR)) return -1; @@ -494,7 +475,7 @@ int tdb_append(struct tdb_context *tdb, struct tdb_data new_dbuf; int ret; - off = find_and_lock(tdb, key, F_WRLCK, &h, &rec); + off = find_and_lock(tdb, key, F_WRLCK, &h, &rec, NULL); if (unlikely(off == TDB_OFF_ERR)) return -1; @@ -562,7 +543,7 @@ struct tdb_data tdb_fetch(struct tdb_context *tdb, struct tdb_data key) struct hash_info h; struct tdb_data ret; - off = find_and_lock(tdb, key, F_RDLCK, &h, &rec); + off = find_and_lock(tdb, key, F_RDLCK, &h, &rec, NULL); if (unlikely(off == TDB_OFF_ERR)) return tdb_null; @@ -585,7 +566,7 @@ int tdb_delete(struct tdb_context *tdb, struct tdb_data key) struct tdb_used_record rec; struct hash_info h; - off = find_and_lock(tdb, key, F_WRLCK, &h, &rec); + off = find_and_lock(tdb, key, F_WRLCK, &h, &rec, NULL); if (unlikely(off == TDB_OFF_ERR)) return -1;