tdb2: get rid of zones

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

diff --git a/ccan/tdb2/test/layout.h b/ccan/tdb2/test/layout.h
index 6cbf3d0d2f727bc0392a5f599bb0fedb9cea1834..216fe297a8fa6b84aa8312dce37d9da76f042855 100644 (file)
--- a/ccan/tdb2/test/layout.h
+++ b/ccan/tdb2/test/layout.h
@@ -3,9 +3,7 @@
 #include <ccan/tdb2/private.h>
 
 struct tdb_layout *new_tdb_layout(const char *filename);
 #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_freelist(struct tdb_layout *layout);

 void tdb_layout_add_free(struct tdb_layout *layout, tdb_len_t len);
 void tdb_layout_add_used(struct tdb_layout *layout,
                         TDB_DATA key, TDB_DATA data,
 void tdb_layout_add_free(struct tdb_layout *layout, tdb_len_t len);
 void tdb_layout_add_used(struct tdb_layout *layout,
                         TDB_DATA key, TDB_DATA data,


@@ -19,7 +17,7 @@ void tdb_layout_add_hashtable(struct tdb_layout *layout,
 struct tdb_context *tdb_layout_get(struct tdb_layout *layout);
 
 enum layout_type {
 struct tdb_context *tdb_layout_get(struct tdb_layout *layout);
 
 enum layout_type {

-       ZONE, FREE, DATA, HASHTABLE,
+       FREELIST, FREE, DATA, HASHTABLE,

 };
 
 /* Shared by all union members. */
 };
 
 /* Shared by all union members. */


@@ -28,9 +26,8 @@ struct tle_base {
        tdb_off_t off;
 };
 
        tdb_off_t off;
 };
 

-struct tle_zone {
+struct tle_freelist {

        struct tle_base base;
        struct tle_base base;

-       unsigned int zone_bits;

 };
 
 struct tle_free {
 };
 
 struct tle_free {


@@ -54,7 +51,7 @@ struct tle_hashtable {
 
 union tdb_layout_elem {
        struct tle_base base;
 
 union tdb_layout_elem {
        struct tle_base base;

-       struct tle_zone zone;
+       struct tle_freelist flist;

        struct tle_free free;
        struct tle_used used;
        struct tle_hashtable hashtable;
        struct tle_free free;
        struct tle_used used;
        struct tle_hashtable hashtable;