tdb2: allow multiple chain locks.

[ccan] / ccan / tdb2 / test / layout.h

diff --git a/ccan/tdb2/test/layout.h b/ccan/tdb2/test/layout.h
index c8991baf67e2acc45837138047c0237aa3e990f6..6e2e6657a70451050db62ee2879657e6e8cb9f8b 100644 (file)
--- a/ccan/tdb2/test/layout.h
+++ b/ccan/tdb2/test/layout.h
@@ -2,23 +2,24 @@
 #define TDB2_TEST_LAYOUT_H
 #include <ccan/tdb2/private.h>
 
-struct tdb_layout *new_tdb_layout(void);
-void tdb_layout_add_free(struct tdb_layout *layout, tdb_len_t len);
+struct tdb_layout *new_tdb_layout(const char *filename);
+void tdb_layout_add_freetable(struct tdb_layout *layout);
+void tdb_layout_add_free(struct tdb_layout *layout, tdb_len_t len,
+                        unsigned ftable);
 void tdb_layout_add_used(struct tdb_layout *layout,
                         TDB_DATA key, TDB_DATA data,
                         tdb_len_t extra);
+#if 0 /* FIXME: Allow allocation of subtables */
 void tdb_layout_add_hashtable(struct tdb_layout *layout,
-                             unsigned int hash_bits,
-                             tdb_len_t extra);
-void tdb_layout_add_freetable(struct tdb_layout *layout,
-                             unsigned int num_zones,
-                             unsigned int zone_bits,
-                             unsigned int num_buckets,
+                             int htable_parent, /* -1 == toplevel */
+                             unsigned int bucket,
                              tdb_len_t extra);
+#endif
 struct tdb_context *tdb_layout_get(struct tdb_layout *layout);
+void tdb_layout_free(struct tdb_layout *layout);
 
 enum layout_type {
-       FREE, DATA, HASHTABLE, FREETABLE,
+       FREETABLE, FREE, DATA, HASHTABLE,
 };
 
 /* Shared by all union members. */
@@ -27,9 +28,14 @@ struct tle_base {
        tdb_off_t off;
 };
 
+struct tle_freetable {
+       struct tle_base base;
+};
+
 struct tle_free {
        struct tle_base base;
        tdb_len_t len;
+       unsigned ftable_num;
 };
 
 struct tle_used {
@@ -41,29 +47,22 @@ struct tle_used {
 
 struct tle_hashtable {
        struct tle_base base;
-       unsigned hash_bits;
-       tdb_len_t extra;
-};
-
-struct tle_freetable {
-       struct tle_base base;
-       unsigned int num_zones;
-       unsigned int zone_bits;
-       unsigned int num_buckets;
+       int parent;
+       unsigned int bucket;
        tdb_len_t extra;
 };
 
 union tdb_layout_elem {
        struct tle_base base;
+       struct tle_freetable ftable;
        struct tle_free free;
        struct tle_used used;
-       struct tle_freetable freetable;
        struct tle_hashtable hashtable;
 };
 
 struct tdb_layout {
+       const char *filename;
        unsigned int num_elems;
        union tdb_layout_elem *elem;
-       unsigned int ftable, htable;
 };
 #endif /* TDB2_TEST_LAYOUT_H */