X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftdb2%2Ftdb.c;h=f7a6a5b358a77b33692296479052f37e0a202ad5;hp=79c76b1991fe5eca77edfdad99ab8d07e3a79d15;hb=dfae76fd82d4bbd8989264dadc2c3c9cde7e5af7;hpb=d1383862ad9a74e713dc915d351b74da4db35078

diff --git a/ccan/tdb2/tdb.c b/ccan/tdb2/tdb.c
index 79c76b19..f7a6a5b3 100644
--- a/ccan/tdb2/tdb.c
+++ b/ccan/tdb2/tdb.c
@@ -80,9 +80,7 @@ static uint64_t random_number(struct tdb_context *tdb)
 
 struct new_database {
 	struct tdb_header hdr;
-	/* Initial free zone. */
-	struct free_zone_header zhdr;
-	tdb_off_t free[BUCKETS_FOR_ZONE(INITIAL_ZONE_BITS) + 1];
+	struct tdb_freelist flist;
 };
 
 /* initialise a new database */
@@ -105,13 +103,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.zhdr.zone_bits = INITIAL_ZONE_BITS;
-	memset(newdb.free, 0, sizeof(newdb.free));
+	newdb.hdr.free_list = offsetof(struct new_database, flist);
+	memset(&newdb.flist, 0, sizeof(newdb.flist));
+	set_used_header(NULL, &newdb.flist.hdr, 0,
+			sizeof(newdb.flist) - sizeof(newdb.flist.hdr),
+			sizeof(newdb.flist) - sizeof(newdb.flist.hdr), 1);
 
 	/* Magic food */
 	memset(newdb.hdr.magic_food, 0, sizeof(newdb.hdr.magic_food));
@@ -176,7 +178,6 @@ struct tdb_context *tdb_open(const char *name, int tdb_flags,
 	tdb->log_priv = NULL;
 	tdb->transaction = NULL;
 	tdb_hash_init(tdb);
-	/* last_zone will be set below. */
 	tdb_io_init(tdb);
 	tdb_lock_init(tdb);
 
@@ -230,7 +231,7 @@ struct tdb_context *tdb_open(const char *name, int tdb_flags,
 		}
 		tdb_convert(tdb, &hdr.hash_seed, sizeof(hdr.hash_seed));
 		tdb->hash_seed = hdr.hash_seed;
-		tdb_zone_init(tdb);
+		tdb_flist_init(tdb);
 		return tdb;
 	}
 
@@ -246,7 +247,7 @@ 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) {
+	if (tdb_lock_open(tdb, TDB_LOCK_WAIT|TDB_LOCK_NOCHECK) == -1) {
 		tdb->log(tdb, TDB_DEBUG_ERROR, tdb->log_priv,
 			 "tdb_open: failed to get open lock on %s: %s\n",
 			 name, strerror(errno));
@@ -314,8 +315,13 @@ 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);
 
-	/* Now we can pick a random free zone to start from. */
-	if (tdb_zone_init(tdb) == -1)
+	/* Now it's fully formed, recover if necessary. */
+	if (tdb_needs_recovery(tdb) && tdb_lock_and_recover(tdb) == -1) {
+		errno = EIO;
+		goto fail;
+	}
+
+	if (tdb_flist_init(tdb) == -1)
 		goto fail;
 
 	tdb->next = tdbs;
@@ -358,8 +364,7 @@ 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,
-		       rec_zone_bits(rec)))
+	if (set_used_header(tdb, rec, keylen, datalen, keylen + dataroom, h))
 		return -1;
 
 	return tdb_write_convert(tdb, off, rec, sizeof(*rec));
@@ -370,7 +375,6 @@ static int 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,
-			unsigned old_zone,
 			bool growing)
 {
 	tdb_off_t new_off;
@@ -382,7 +386,7 @@ static int replace_data(struct tdb_context *tdb,
 
 	/* We didn't like the existing one: remove it. */
 	if (old_off) {
-		add_free_record(tdb, old_zone, old_off,
+		add_free_record(tdb, old_off,
 				sizeof(struct tdb_used_record)
 				+ key.dsize + old_room);
 		if (replace_in_hash(tdb, h, new_off) == -1)
@@ -454,8 +458,7 @@ int tdb_store(struct tdb_context *tdb,
 	}
 
 	/* If we didn't use the old record, this implies we're growing. */
-	ret = replace_data(tdb, &h, key, dbuf, off, old_room,
-			   rec_zone_bits(&rec), off != 0);
+	ret = replace_data(tdb, &h, key, dbuf, off, old_room, off != 0);
 	tdb_unlock_hashes(tdb, h.hlock_start, h.hlock_range, F_WRLCK);
 	return ret;
 
@@ -524,8 +527,7 @@ 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, off,
-			   old_room, rec_zone_bits(&rec), true);
+	ret = replace_data(tdb, &h, key, new_dbuf, off, old_room, true);
 	tdb_unlock_hashes(tdb, h.hlock_start, h.hlock_range, F_WRLCK);
 	free(newdata);
 
@@ -580,7 +582,7 @@ int tdb_delete(struct tdb_context *tdb, struct tdb_data key)
 		goto unlock_err;
 
 	/* Free the deleted entry. */
-	if (add_free_record(tdb, rec_zone_bits(&rec), off,
+	if (add_free_record(tdb, off,
 			    sizeof(struct tdb_used_record)
 			    + rec_key_length(&rec)
 			    + rec_data_length(&rec)
@@ -600,12 +602,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)