tdb2: allow multiple chain locks.

[ccan] / ccan / tdb2 / test / run-50-multiple-freelists.c

diff --git a/ccan/tdb2/test/run-50-multiple-freelists.c b/ccan/tdb2/test/run-50-multiple-freelists.c
index fd709730da7ce0370b9c7dfce3d834c3ba41cc75..7a48c3e0eee7726e9fd209587d1f0c50fed59002 100644 (file)
--- a/ccan/tdb2/test/run-50-multiple-freelists.c
+++ b/ccan/tdb2/test/run-50-multiple-freelists.c
@@ -1,4 +1,5 @@
 #include <ccan/tdb2/tdb.c>
+#include <ccan/tdb2/open.c>
 #include <ccan/tdb2/free.c>
 #include <ccan/tdb2/lock.c>
 #include <ccan/tdb2/io.c>
@@ -17,16 +18,14 @@ int main(int argc, char *argv[])
        TDB_DATA key, data;
 
        plan_tests(11);
-       key.dptr = (unsigned char *)"Hello";
-       data.dptr = (unsigned char *)"world";
-       data.dsize = 5;
-       key.dsize = 5;
+       key = tdb_mkdata("Hello", 5);
+       data = tdb_mkdata("world", 5);
 
-       /* Create a TDB with three free lists. */
+       /* Create a TDB with three free tables. */
        layout = new_tdb_layout(NULL);
-       tdb_layout_add_freelist(layout);
-       tdb_layout_add_freelist(layout);
-       tdb_layout_add_freelist(layout);
+       tdb_layout_add_freetable(layout);
+       tdb_layout_add_freetable(layout);
+       tdb_layout_add_freetable(layout);
        tdb_layout_add_free(layout, 80, 0);
        /* Used record prevent coalescing. */
        tdb_layout_add_used(layout, key, data, 6);
@@ -40,27 +39,32 @@ int main(int argc, char *argv[])
        tdb = tdb_layout_get(layout);
        ok1(tdb_check(tdb, NULL, NULL) == 0);
 
-       off = get_free(tdb, 0, 80 - sizeof(struct tdb_used_record), 0, 0);
+       off = get_free(tdb, 0, 80 - sizeof(struct tdb_used_record), 0,
+                      TDB_USED_MAGIC, 0);
        ok1(off == layout->elem[3].base.off);
-       ok1(tdb->flist_off == layout->elem[0].base.off);
+       ok1(tdb->ftable_off == layout->elem[0].base.off);
 
-       off = get_free(tdb, 0, 160 - sizeof(struct tdb_used_record), 0, 0);
+       off = get_free(tdb, 0, 160 - sizeof(struct tdb_used_record), 0,
+                      TDB_USED_MAGIC, 0);
        ok1(off == layout->elem[5].base.off);
-       ok1(tdb->flist_off == layout->elem[1].base.off);
+       ok1(tdb->ftable_off == layout->elem[1].base.off);
 
-       off = get_free(tdb, 0, 320 - sizeof(struct tdb_used_record), 0, 0);
+       off = get_free(tdb, 0, 320 - sizeof(struct tdb_used_record), 0,
+                      TDB_USED_MAGIC, 0);
        ok1(off == layout->elem[7].base.off);
-       ok1(tdb->flist_off == layout->elem[2].base.off);
+       ok1(tdb->ftable_off == layout->elem[2].base.off);
 
-       off = get_free(tdb, 0, 40 - sizeof(struct tdb_used_record), 0, 0);
+       off = get_free(tdb, 0, 40 - sizeof(struct tdb_used_record), 0,
+                      TDB_USED_MAGIC, 0);
        ok1(off == layout->elem[9].base.off);
-       ok1(tdb->flist_off == layout->elem[0].base.off);
+       ok1(tdb->ftable_off == layout->elem[0].base.off);
 
        /* Now we fail. */
-       off = get_free(tdb, 0, 0, 1, 0);
+       off = get_free(tdb, 0, 0, 1, TDB_USED_MAGIC, 0);
        ok1(off == 0);
 
        tdb_close(tdb);
+       tdb_layout_free(layout);
 
        ok1(tap_log_messages == 0);
        return exit_status();