X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftdb2%2Ftest%2Flayout.h;h=9a7148460152bf6e36bf7e9ab786027a6f7203bd;hp=6cbf3d0d2f727bc0392a5f599bb0fedb9cea1834;hb=0b93bd102aad6b61f1e569fb12aabc6352a1d7cd;hpb=9071df66fc6a29cc8b6cd52c91134efe7b57f007

diff --git a/ccan/tdb2/test/layout.h b/ccan/tdb2/test/layout.h
index 6cbf3d0d..9a714846 100644
--- a/ccan/tdb2/test/layout.h
+++ b/ccan/tdb2/test/layout.h
@@ -2,24 +2,37 @@
 #define TDB2_TEST_LAYOUT_H
 #include <ccan/tdb2/private.h>
 
-struct tdb_layout *new_tdb_layout(const char *filename);
-void tdb_layout_add_zone(struct tdb_layout *layout,
-			 unsigned int zone_bits,
-			 bool fill_prev);
-void tdb_layout_add_free(struct tdb_layout *layout, tdb_len_t len);
+struct tdb_layout *new_tdb_layout(void);
+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);
+void tdb_layout_add_capability(struct tdb_layout *layout,
+			       uint64_t type,
+			       bool write_breaks,
+			       bool check_breaks,
+			       bool open_breaks,
+			       tdb_len_t extra);
+
 #if 0 /* FIXME: Allow allocation of subtables */
 void tdb_layout_add_hashtable(struct tdb_layout *layout,
 			      int htable_parent, /* -1 == toplevel */
 			      unsigned int bucket,
 			      tdb_len_t extra);
 #endif
-struct tdb_context *tdb_layout_get(struct tdb_layout *layout);
+/* freefn is needed if we're using failtest_free. */
+struct tdb_context *tdb_layout_get(struct tdb_layout *layout,
+				   void (*freefn)(void *),
+				   union tdb_attribute *attr);
+void tdb_layout_write(struct tdb_layout *layout, void (*freefn)(void *),
+		       union tdb_attribute *attr, const char *filename);
+
+void tdb_layout_free(struct tdb_layout *layout);
 
 enum layout_type {
-	ZONE, FREE, DATA, HASHTABLE,
+	FREETABLE, FREE, DATA, HASHTABLE, CAPABILITY
 };
 
 /* Shared by all union members. */
@@ -28,14 +41,14 @@ struct tle_base {
 	tdb_off_t off;
 };
 
-struct tle_zone {
+struct tle_freetable {
 	struct tle_base base;
-	unsigned int zone_bits;
 };
 
 struct tle_free {
 	struct tle_base base;
 	tdb_len_t len;
+	unsigned ftable_num;
 };
 
 struct tle_used {
@@ -52,16 +65,22 @@ struct tle_hashtable {
 	tdb_len_t extra;
 };
 
+struct tle_capability {
+	struct tle_base base;
+	uint64_t type;
+	tdb_len_t extra;
+};
+
 union tdb_layout_elem {
 	struct tle_base base;
-	struct tle_zone zone;
+	struct tle_freetable ftable;
 	struct tle_free free;
 	struct tle_used used;
 	struct tle_hashtable hashtable;
+	struct tle_capability capability;
 };
 
 struct tdb_layout {
-	const char *filename;
 	unsigned int num_elems;
 	union tdb_layout_elem *elem;
 };