X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Ftdb2%2Ftest%2Frun-03-coalesce.c;h=b8bf25cb02fce7f9fdcb28016faf2210cb10e3de;hp=d3e624cf5bf66bdeda53e2b10487e543cfe1364c;hb=d70577b6aff24ccf6815896509dabb8c9ac07904;hpb=1a24a8708494668c07e5c02284bfc2ef3b09603b diff --git a/ccan/tdb2/test/run-03-coalesce.c b/ccan/tdb2/test/run-03-coalesce.c index d3e624cf..b8bf25cb 100644 --- a/ccan/tdb2/test/run-03-coalesce.c +++ b/ccan/tdb2/test/run-03-coalesce.c @@ -2,6 +2,7 @@ #include #include #include +#include #include #include #include "logging.h" @@ -20,161 +21,122 @@ static tdb_len_t free_record_length(struct tdb_context *tdb, tdb_off_t off) int main(int argc, char *argv[]) { - tdb_off_t b_off, zone_off; + tdb_off_t b_off; struct tdb_context *tdb; struct tdb_layout *layout; struct tdb_data data, key; tdb_len_t len; - unsigned int zone_bits = 16; /* FIXME: Test TDB_CONVERT */ - plan_tests(45); + plan_tests(38); data.dptr = (void *)"world"; data.dsize = 5; key.dptr = (void *)"hello"; key.dsize = 5; /* No coalescing can be done due to EOF */ - layout = new_tdb_layout(); - tdb_layout_add_zone(layout, zone_bits, false); - tdb_layout_add_hashtable(layout, 12, 0); + layout = new_tdb_layout(NULL); + tdb_layout_add_freelist(layout); + len = 1024; + tdb_layout_add_free(layout, len); tdb = tdb_layout_get(layout); - len = layout->elem[2].free.len; - zone_off = layout->elem[0].base.off; ok1(tdb_check(tdb, NULL, NULL) == 0); - ok1(free_record_length(tdb, layout->elem[2].base.off) == len); + ok1(free_record_length(tdb, layout->elem[1].base.off) == len); /* Figure out which bucket free entry is. */ - b_off = bucket_off(zone_off, size_to_bucket(zone_bits, len)); + b_off = bucket_off(tdb->flist_off, size_to_bucket(len)); /* Lock and fail to coalesce. */ ok1(tdb_lock_free_bucket(tdb, b_off, TDB_LOCK_WAIT) == 0); - ok1(coalesce(tdb, zone_off, zone_bits, layout->elem[2].base.off, - b_off, len) == 0); + ok1(coalesce(tdb, layout->elem[1].base.off, b_off, len) == 0); tdb_unlock_free_bucket(tdb, b_off); - tdb_unlock_list(tdb, 0, F_WRLCK); - ok1(free_record_length(tdb, layout->elem[2].base.off) == len); + ok1(free_record_length(tdb, layout->elem[1].base.off) == len); ok1(tdb_check(tdb, NULL, NULL) == 0); tdb_close(tdb); /* No coalescing can be done due to used record */ - layout = new_tdb_layout(); - tdb_layout_add_zone(layout, zone_bits, false); - tdb_layout_add_hashtable(layout, 12, 0); + layout = new_tdb_layout(NULL); + tdb_layout_add_freelist(layout); tdb_layout_add_free(layout, 1024); tdb_layout_add_used(layout, key, data, 6); tdb = tdb_layout_get(layout); - zone_off = layout->elem[0].base.off; - ok1(free_record_length(tdb, layout->elem[2].base.off) == 1024); + ok1(free_record_length(tdb, layout->elem[1].base.off) == 1024); ok1(tdb_check(tdb, NULL, NULL) == 0); /* Figure out which bucket free entry is. */ - b_off = bucket_off(zone_off, size_to_bucket(zone_bits, 1024)); + b_off = bucket_off(tdb->flist_off, size_to_bucket(1024)); /* Lock and fail to coalesce. */ ok1(tdb_lock_free_bucket(tdb, b_off, TDB_LOCK_WAIT) == 0); - ok1(coalesce(tdb, zone_off, zone_bits, layout->elem[2].base.off, - b_off, 1024) == 0); + ok1(coalesce(tdb, layout->elem[1].base.off, b_off, 1024) == 0); tdb_unlock_free_bucket(tdb, b_off); - ok1(free_record_length(tdb, layout->elem[2].base.off) == 1024); + ok1(free_record_length(tdb, layout->elem[1].base.off) == 1024); ok1(tdb_check(tdb, NULL, NULL) == 0); tdb_close(tdb); /* Coalescing can be done due to two free records, then EOF */ - layout = new_tdb_layout(); - tdb_layout_add_zone(layout, zone_bits, false); - tdb_layout_add_hashtable(layout, 12, 0); + layout = new_tdb_layout(NULL); + tdb_layout_add_freelist(layout); tdb_layout_add_free(layout, 1024); + tdb_layout_add_free(layout, 2048); tdb = tdb_layout_get(layout); - zone_off = layout->elem[0].base.off; - len = layout->elem[3].free.len; - ok1(free_record_length(tdb, layout->elem[2].base.off) == 1024); - ok1(free_record_length(tdb, layout->elem[3].base.off) == len); + ok1(free_record_length(tdb, layout->elem[1].base.off) == 1024); + ok1(free_record_length(tdb, layout->elem[2].base.off) == 2048); ok1(tdb_check(tdb, NULL, NULL) == 0); /* Figure out which bucket (first) free entry is. */ - b_off = bucket_off(zone_off, size_to_bucket(zone_bits, 1024)); + b_off = bucket_off(tdb->flist_off, size_to_bucket(1024)); /* Lock and coalesce. */ ok1(tdb_lock_free_bucket(tdb, b_off, TDB_LOCK_WAIT) == 0); - ok1(coalesce(tdb, zone_off, zone_bits, layout->elem[2].base.off, - b_off, 1024) == 1); + ok1(coalesce(tdb, layout->elem[1].base.off, b_off, 1024) == 1); ok1(!tdb_has_locks(tdb)); - ok1(free_record_length(tdb, layout->elem[2].base.off) - == 1024 + sizeof(struct tdb_used_record) + len); + ok1(free_record_length(tdb, layout->elem[1].base.off) + == 1024 + sizeof(struct tdb_used_record) + 2048); ok1(tdb_check(tdb, NULL, NULL) == 0); tdb_close(tdb); /* Coalescing can be done due to two free records, then data */ - layout = new_tdb_layout(); - tdb_layout_add_zone(layout, zone_bits, false); - tdb_layout_add_hashtable(layout, 12, 0); + layout = new_tdb_layout(NULL); + tdb_layout_add_freelist(layout); tdb_layout_add_free(layout, 1024); tdb_layout_add_free(layout, 512); tdb_layout_add_used(layout, key, data, 6); tdb = tdb_layout_get(layout); - zone_off = layout->elem[0].base.off; - ok1(free_record_length(tdb, layout->elem[2].base.off) == 1024); - ok1(free_record_length(tdb, layout->elem[3].base.off) == 512); + ok1(free_record_length(tdb, layout->elem[1].base.off) == 1024); + ok1(free_record_length(tdb, layout->elem[2].base.off) == 512); ok1(tdb_check(tdb, NULL, NULL) == 0); /* Figure out which bucket free entry is. */ - b_off = bucket_off(zone_off, size_to_bucket(zone_bits, 1024)); + b_off = bucket_off(tdb->flist_off, size_to_bucket(1024)); /* Lock and coalesce. */ ok1(tdb_lock_free_bucket(tdb, b_off, TDB_LOCK_WAIT) == 0); - ok1(coalesce(tdb, zone_off, zone_bits, layout->elem[2].base.off, - b_off, 1024) == 1); + ok1(coalesce(tdb, layout->elem[1].base.off, b_off, 1024) == 1); ok1(!tdb_has_locks(tdb)); - ok1(free_record_length(tdb, layout->elem[2].base.off) + ok1(free_record_length(tdb, layout->elem[1].base.off) == 1024 + sizeof(struct tdb_used_record) + 512); ok1(tdb_check(tdb, NULL, NULL) == 0); tdb_close(tdb); /* Coalescing can be done due to three free records, then EOF */ - layout = new_tdb_layout(); - tdb_layout_add_zone(layout, zone_bits, false); - tdb_layout_add_hashtable(layout, 12, 0); + layout = new_tdb_layout(NULL); + tdb_layout_add_freelist(layout); tdb_layout_add_free(layout, 1024); tdb_layout_add_free(layout, 512); + tdb_layout_add_free(layout, 256); tdb = tdb_layout_get(layout); - zone_off = layout->elem[0].base.off; - len = layout->elem[4].free.len; - ok1(free_record_length(tdb, layout->elem[2].base.off) == 1024); - ok1(free_record_length(tdb, layout->elem[3].base.off) == 512); - ok1(free_record_length(tdb, layout->elem[4].base.off) == len); + ok1(free_record_length(tdb, layout->elem[1].base.off) == 1024); + ok1(free_record_length(tdb, layout->elem[2].base.off) == 512); + ok1(free_record_length(tdb, layout->elem[3].base.off) == 256); ok1(tdb_check(tdb, NULL, NULL) == 0); /* Figure out which bucket free entry is. */ - b_off = bucket_off(zone_off, size_to_bucket(zone_bits, 1024)); + b_off = bucket_off(tdb->flist_off, size_to_bucket(1024)); /* Lock and coalesce. */ ok1(tdb_lock_free_bucket(tdb, b_off, TDB_LOCK_WAIT) == 0); - ok1(coalesce(tdb, zone_off, zone_bits, layout->elem[2].base.off, - b_off, 1024) == 1); + ok1(coalesce(tdb, layout->elem[1].base.off, b_off, 1024) == 1); ok1(!tdb_has_locks(tdb)); - ok1(free_record_length(tdb, layout->elem[2].base.off) + ok1(free_record_length(tdb, layout->elem[1].base.off) == 1024 + sizeof(struct tdb_used_record) + 512 - + sizeof(struct tdb_used_record) + len); - ok1(tdb_check(tdb, NULL, NULL) == 0); - tdb_close(tdb); - - /* Coalescing across two zones isn't possible. */ - layout = new_tdb_layout(); - tdb_layout_add_zone(layout, zone_bits, false); - tdb_layout_add_hashtable(layout, 12, 0); - tdb_layout_add_zone(layout, zone_bits, true); - tdb = tdb_layout_get(layout); - zone_off = layout->elem[0].base.off; - len = layout->elem[2].free.len; - ok1(free_record_length(tdb, layout->elem[2].base.off) == len); - ok1(tdb_check(tdb, NULL, NULL) == 0); - - /* Figure out which list free entry is. */ - b_off = bucket_off(zone_off, size_to_bucket(zone_bits, len)); - /* Lock and coalesce. */ - ok1(tdb_lock_free_bucket(tdb, b_off, TDB_LOCK_WAIT) == 0); - ok1(coalesce(tdb, zone_off, zone_bits, layout->elem[2].base.off, - b_off, len) == 0); - tdb_unlock_free_bucket(tdb, b_off); - ok1(!tdb_has_locks(tdb)); - ok1(free_record_length(tdb, layout->elem[2].base.off) == len); + + sizeof(struct tdb_used_record) + 256); ok1(tdb_check(tdb, NULL, NULL) == 0); tdb_close(tdb);