tdb2: rename set_header to the more appropriate set_used_header.

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

diff --git a/ccan/tdb2/test/layout.c b/ccan/tdb2/test/layout.c
index 67a6633d7fad5b6e9bc59f9d4a683160dfd069e0..3049d3214e62736ec95ddbe979cafe7784034593 100644 (file)
--- a/ccan/tdb2/test/layout.c
+++ b/ccan/tdb2/test/layout.c
@@ -30,11 +30,13 @@ void tdb_layout_add_freelist(struct tdb_layout *layout)
        add(layout, elem);
 }
 
        add(layout, elem);
 }
 

-void tdb_layout_add_free(struct tdb_layout *layout, tdb_len_t len)
+void tdb_layout_add_free(struct tdb_layout *layout, tdb_len_t len,
+                        unsigned flist)

 {
        union tdb_layout_elem elem;
        elem.base.type = FREE;
        elem.free.len = len;
 {
        union tdb_layout_elem elem;
        elem.base.type = FREE;
        elem.free.len = len;

+       elem.free.flist_num = flist;

        add(layout, elem);
 }
 
        add(layout, elem);
 }
 


@@ -95,9 +97,9 @@ static void set_data_record(void *mem, struct tdb_context *tdb,
 {
        struct tdb_used_record *u = mem;
 
 {
        struct tdb_used_record *u = mem;
 

-       set_header(tdb, u, used->key.dsize, used->data.dsize,
-                  used->key.dsize + used->data.dsize + used->extra,
-                  tdb_hash(tdb, used->key.dptr, used->key.dsize));
+       set_used_header(tdb, u, used->key.dsize, used->data.dsize,
+                       used->key.dsize + used->data.dsize + used->extra,
+                       tdb_hash(tdb, used->key.dptr, used->key.dsize));

        memcpy(u + 1, used->key.dptr, used->key.dsize);
        memcpy((char *)(u + 1) + used->key.dsize,
               used->data.dptr, used->data.dsize);
        memcpy(u + 1, used->key.dptr, used->key.dsize);
        memcpy((char *)(u + 1) + used->key.dsize,
               used->data.dptr, used->data.dsize);


@@ -109,24 +111,34 @@ static void set_hashtable(void *mem, struct tdb_context *tdb,
        struct tdb_used_record *u = mem;
        tdb_len_t len = sizeof(tdb_off_t) << TDB_SUBLEVEL_HASH_BITS;
 
        struct tdb_used_record *u = mem;
        tdb_len_t len = sizeof(tdb_off_t) << TDB_SUBLEVEL_HASH_BITS;
 

-       set_header(tdb, u, 0, len, len + htable->extra, 0);
+       set_used_header(tdb, u, 0, len, len + htable->extra, 0);

        memset(u + 1, 0, len);
 }
 
 static void set_freelist(void *mem, struct tdb_context *tdb,
        memset(u + 1, 0, len);
 }
 
 static void set_freelist(void *mem, struct tdb_context *tdb,

-                        struct tle_freelist *freelist)
+                        struct tle_freelist *freelist, struct tdb_header *hdr,
+                        tdb_off_t last_flist)

 {
        struct tdb_freelist *flist = mem;
        memset(flist, 0, sizeof(*flist));
 {
        struct tdb_freelist *flist = mem;
        memset(flist, 0, sizeof(*flist));

-       set_header(tdb, &flist->hdr, 0,
-                  sizeof(*flist) - sizeof(flist->hdr),
-                  sizeof(*flist) - sizeof(flist->hdr), 1);
+       set_used_header(tdb, &flist->hdr, 0,
+                       sizeof(*flist) - sizeof(flist->hdr),
+                       sizeof(*flist) - sizeof(flist->hdr), 1);
+
+       if (last_flist) {
+               flist = (struct tdb_freelist *)((char *)hdr + last_flist);
+               flist->next = freelist->base.off;
+       } else {
+               hdr->free_list = freelist->base.off;
+       }

 }
 
 static void add_to_freetable(struct tdb_context *tdb,
                             tdb_off_t eoff,
 }
 
 static void add_to_freetable(struct tdb_context *tdb,
                             tdb_off_t eoff,

-                            tdb_off_t elen)
+                            tdb_off_t elen,
+                            struct tle_freelist *freelist)

 {
 {

+       tdb->flist_off = freelist->base.off;

        add_free_record(tdb, eoff, sizeof(struct tdb_used_record) + elen);
 }
 
        add_free_record(tdb, eoff, sizeof(struct tdb_used_record) + elen);
 }
 


@@ -190,11 +202,25 @@ static void add_to_hashtable(struct tdb_context *tdb,
        abort();
 }
 
        abort();
 }
 

+static struct tle_freelist *find_flist(struct tdb_layout *layout, unsigned num)
+{
+       unsigned i;
+
+       for (i = 0; i < layout->num_elems; i++) {
+               if (layout->elem[i].base.type != FREELIST)
+                       continue;
+               if (num == 0)
+                       return &layout->elem[i].flist;
+               num--;
+       }
+       abort();
+}
+

 /* FIXME: Support TDB_CONVERT */
 struct tdb_context *tdb_layout_get(struct tdb_layout *layout)
 {
        unsigned int i;
 /* FIXME: Support TDB_CONVERT */
 struct tdb_context *tdb_layout_get(struct tdb_layout *layout)
 {
        unsigned int i;

-       tdb_off_t off, len, flist_off = 0;
+       tdb_off_t off, len, last_flist;

        char *mem;
        struct tdb_context *tdb;
 
        char *mem;
        struct tdb_context *tdb;
 


@@ -206,8 +232,6 @@ struct tdb_context *tdb_layout_get(struct tdb_layout *layout)
                e->base.off = off;
                switch (e->base.type) {
                case FREELIST:
                e->base.off = off;
                switch (e->base.type) {
                case FREELIST:

-                       assert(flist_off == 0);
-                       flist_off = off;

                        len = freelist_len(&e->flist);
                        break;
                case FREE:
                        len = freelist_len(&e->flist);
                        break;
                case FREE:


@@ -224,8 +248,6 @@ struct tdb_context *tdb_layout_get(struct tdb_layout *layout)
                }
                off += len;
        }
                }
                off += len;
        }

-       /* Must have a free list! */
-       assert(flist_off);

 
        mem = malloc(off);
        /* Now populate our header, cribbing from a real TDB header. */
 
        mem = malloc(off);
        /* Now populate our header, cribbing from a real TDB header. */


@@ -236,13 +258,15 @@ struct tdb_context *tdb_layout_get(struct tdb_layout *layout)
        free(tdb->map_ptr);
        tdb->map_ptr = mem;
        tdb->map_size = off;
        free(tdb->map_ptr);
        tdb->map_ptr = mem;
        tdb->map_size = off;

-       tdb->flist_off = flist_off;

 
 

+       last_flist = 0;

        for (i = 0; i < layout->num_elems; i++) {
                union tdb_layout_elem *e = &layout->elem[i];
                switch (e->base.type) {
                case FREELIST:
        for (i = 0; i < layout->num_elems; i++) {
                union tdb_layout_elem *e = &layout->elem[i];
                switch (e->base.type) {
                case FREELIST:

-                       set_freelist(mem + e->base.off, tdb, &e->flist);
+                       set_freelist(mem + e->base.off, tdb, &e->flist,
+                                    (struct tdb_header *)mem, last_flist);
+                       last_flist = e->base.off;

                        break;
                case FREE:
                        set_free_record(mem + e->base.off, e->free.len);
                        break;
                case FREE:
                        set_free_record(mem + e->base.off, e->free.len);


@@ -255,13 +279,16 @@ struct tdb_context *tdb_layout_get(struct tdb_layout *layout)
                        break;
                }
        }
                        break;
                }
        }

+       /* Must have a free list! */
+       assert(last_flist);

 
        /* Now fill the free and hash tables. */
        for (i = 0; i < layout->num_elems; i++) {
                union tdb_layout_elem *e = &layout->elem[i];
                switch (e->base.type) {
                case FREE:
 
        /* Now fill the free and hash tables. */
        for (i = 0; i < layout->num_elems; i++) {
                union tdb_layout_elem *e = &layout->elem[i];
                switch (e->base.type) {
                case FREE:

-                       add_to_freetable(tdb, e->base.off, e->free.len);
+                       add_to_freetable(tdb, e->base.off, e->free.len,
+                                        find_flist(layout, e->free.flist_num));

                        break;
                case DATA:
                        add_to_hashtable(tdb, e->base.off, e->used.key);
                        break;
                case DATA:
                        add_to_hashtable(tdb, e->base.off, e->used.key);


@@ -271,6 +298,8 @@ struct tdb_context *tdb_layout_get(struct tdb_layout *layout)
                }
        }
 
                }
        }
 

+       tdb->flist_off = find_flist(layout, 0)->base.off;
+

        /* Get physical if they asked for it. */
        if (layout->filename) {
                int fd = open(layout->filename, O_WRONLY|O_TRUNC|O_CREAT,
        /* Get physical if they asked for it. */
        if (layout->filename) {
                int fd = open(layout->filename, O_WRONLY|O_TRUNC|O_CREAT,