On 08.03.2016 05:44, Fam Zheng wrote: > Signed-off-by: Fam Zheng <f...@redhat.com> > Reviewed-by: John Snow <js...@redhat.com> > --- > tests/test-hbitmap.c | 116 > +++++++++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 116 insertions(+) > > diff --git a/tests/test-hbitmap.c b/tests/test-hbitmap.c > index abe1427..c00c2b5 100644 > --- a/tests/test-hbitmap.c > +++ b/tests/test-hbitmap.c > @@ -12,6 +12,7 @@ > #include "qemu/osdep.h" > #include <glib.h> > #include "qemu/hbitmap.h" > +#include "block/block.h" > > #define LOG_BITS_PER_LONG (BITS_PER_LONG == 32 ? 5 : 6) > > @@ -21,6 +22,7 @@ > > typedef struct TestHBitmapData { > HBitmap *hb; > + HBitmap *meta; > unsigned long *bits; > size_t size; > size_t old_size; > @@ -92,6 +94,14 @@ static void hbitmap_test_init(TestHBitmapData *data, > } > } > > +static void hbitmap_test_init_meta(TestHBitmapData *data, > + uint64_t size, int granularity, > + int meta_chunk) > +{ > + hbitmap_test_init(data, size, granularity); > + data->meta = hbitmap_create_meta(data->hb, meta_chunk); > +} > + > static inline size_t hbitmap_test_array_size(size_t bits) > { > size_t n = (bits + BITS_PER_LONG - 1) / BITS_PER_LONG; > @@ -134,6 +144,9 @@ static void hbitmap_test_teardown(TestHBitmapData *data, > const void *unused) > { > if (data->hb) { > + if (data->meta) { > + hbitmap_free_meta(data->hb); > + } > hbitmap_free(data->hb); > data->hb = NULL; > } > @@ -635,6 +648,103 @@ static void > test_hbitmap_truncate_shrink_large(TestHBitmapData *data, > hbitmap_test_truncate(data, size, -diff, 0); > } > > +static void hbitmap_check_meta(TestHBitmapData *data, > + int64_t start, int count) > +{ > + int64_t i; > + > + for (i = 0; i < data->size; i++) { > + if (i >= start && i < start + count) { > + g_assert(hbitmap_get(data->meta, i)); > + } else { > + g_assert(!hbitmap_get(data->meta, i)); > + } > + } > +} > + > +static void hbitmap_test_meta(TestHBitmapData *data, > + int64_t start, int count, > + int64_t check_start, int check_count) > +{ > + hbitmap_reset_all(data->hb); > + hbitmap_reset_all(data->meta); > + > + /* Test "unset" -> "unset" will not update meta. */ > + hbitmap_reset(data->hb, start, count); > + hbitmap_check_meta(data, 0, 0); > + > + /* Test "unset" -> "set" will update meta */ > + hbitmap_set(data->hb, start, count); > + hbitmap_check_meta(data, check_start, check_count); > + > + /* Test "set" -> "set" will not update meta */ > + hbitmap_reset_all(data->meta); > + hbitmap_set(data->hb, start, count); > + hbitmap_check_meta(data, 0, 0);
Well, but if you'd do an hbitmap_set(data->hb, start, count + 1), then it would update meta, right? I forgot to mention in my reply to patch 7 that the check whether anything in the range passed to hbitmap_set() has been changed in order to determine whether all of that range should be set in the meta bitmap seemed a bit excessive. I don't think this will hurt anyone, but still. (So this is not a NACK, just a question.) Max > + > + /* Test "set" -> "unset" will update meta */ > + hbitmap_reset_all(data->meta); > + hbitmap_reset(data->hb, start, count); > + hbitmap_check_meta(data, check_start, check_count); > +} > + > +static void hbitmap_test_meta_do(TestHBitmapData *data, int chunk_size) > +{ > + uint64_t size = chunk_size * 100; > + hbitmap_test_init_meta(data, size, 0, chunk_size); > + > + hbitmap_test_meta(data, 0, 1, 0, chunk_size); > + hbitmap_test_meta(data, 0, chunk_size, 0, chunk_size); > + hbitmap_test_meta(data, chunk_size - 1, 1, 0, chunk_size); > + hbitmap_test_meta(data, chunk_size - 1, 2, 0, chunk_size * 2); > + hbitmap_test_meta(data, chunk_size - 1, chunk_size + 1, 0, chunk_size * > 2); > + hbitmap_test_meta(data, chunk_size - 1, chunk_size + 2, 0, chunk_size * > 3); > + hbitmap_test_meta(data, 7 * chunk_size - 1, chunk_size + 2, > + 6 * chunk_size, chunk_size * 3); > + hbitmap_test_meta(data, size - 1, 1, size - chunk_size, chunk_size); > + hbitmap_test_meta(data, 0, size, 0, size); > +} > + > +static void test_hbitmap_meta_byte(TestHBitmapData *data, const void *unused) > +{ > + hbitmap_test_meta_do(data, BITS_PER_BYTE); > +} > + > +static void test_hbitmap_meta_word(TestHBitmapData *data, const void *unused) > +{ > + hbitmap_test_meta_do(data, BITS_PER_LONG); > +} > + > +static void test_hbitmap_meta_sector(TestHBitmapData *data, const void > *unused) > +{ > + hbitmap_test_meta_do(data, BDRV_SECTOR_SIZE * BITS_PER_BYTE); > +} > + > +/** > + * Create an HBitmap and test set/unset. > + */ > +static void test_hbitmap_meta_one(TestHBitmapData *data, const void *unused) > +{ > + int i; > + int64_t offsets[] = { > + 0, 1, L1 - 1, L1, L1 + 1, L2 - 1, L2, L2 + 1, L3 - 1, L3, L3 + 1 > + }; > + > + hbitmap_test_init_meta(data, L3 * 2, 0, 1); > + for (i = 0; i < ARRAY_SIZE(offsets); i++) { > + hbitmap_test_meta(data, offsets[i], 1, offsets[i], 1); > + hbitmap_test_meta(data, offsets[i], L1, offsets[i], L1); > + hbitmap_test_meta(data, offsets[i], L2, offsets[i], L2); > + } > +} > + > +static void test_hbitmap_meta_zero(TestHBitmapData *data, const void *unused) > +{ > + hbitmap_test_init_meta(data, 0, 0, 1); > + > + hbitmap_check_meta(data, 0, 0); > +} > + > static void hbitmap_test_add(const char *testpath, > void (*test_func)(TestHBitmapData *data, > const void *user_data)) > { > @@ -684,6 +794,12 @@ int main(int argc, char **argv) > test_hbitmap_truncate_grow_large); > hbitmap_test_add("/hbitmap/truncate/shrink/large", > test_hbitmap_truncate_shrink_large); > + > + hbitmap_test_add("/hbitmap/meta/zero", test_hbitmap_meta_zero); > + hbitmap_test_add("/hbitmap/meta/one", test_hbitmap_meta_one); > + hbitmap_test_add("/hbitmap/meta/byte", test_hbitmap_meta_byte); > + hbitmap_test_add("/hbitmap/meta/word", test_hbitmap_meta_word); > + hbitmap_test_add("/hbitmap/meta/sector", test_hbitmap_meta_sector); > g_test_run(); > > return 0; >
signature.asc
Description: OpenPGP digital signature