From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34474) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aGuz2-0007aU-Qt for qemu-devel@nongnu.org; Wed, 06 Jan 2016 15:47:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aGuz1-00013K-Ie for qemu-devel@nongnu.org; Wed, 06 Jan 2016 15:47:04 -0500 References: <1451903234-32529-1-git-send-email-famz@redhat.com> <1451903234-32529-8-git-send-email-famz@redhat.com> From: John Snow Message-ID: <568D7D3E.6000703@redhat.com> Date: Wed, 6 Jan 2016 15:46:54 -0500 MIME-Version: 1.0 In-Reply-To: <1451903234-32529-8-git-send-email-famz@redhat.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH 07/13] tests: Add test code for meta bitmap List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Fam Zheng , qemu-devel@nongnu.org Cc: Kevin Wolf , Jeff Cody , Vladimir Sementsov-Ogievskiy , qemu-block@nongnu.org On 01/04/2016 05:27 AM, Fam Zheng wrote: > Signed-off-by: Fam Zheng > --- > tests/test-hbitmap.c | 113 +++++++++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 113 insertions(+) > > diff --git a/tests/test-hbitmap.c b/tests/test-hbitmap.c > index abcea0c..19136e7 100644 > --- a/tests/test-hbitmap.c > +++ b/tests/test-hbitmap.c > @@ -14,6 +14,7 @@ > #include > #include > #include "qemu/hbitmap.h" > +#include "block/block.h" > > #define LOG_BITS_PER_LONG (BITS_PER_LONG == 32 ? 5 : 6) > > @@ -23,6 +24,7 @@ > > typedef struct TestHBitmapData { > HBitmap *hb; > + HBitmap *meta; > unsigned long *bits; > size_t size; > size_t old_size; > @@ -94,6 +96,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; > @@ -637,6 +647,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); > + > + /* 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)) > { > @@ -686,6 +793,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; > looks quite thorough! Reviewed-by: John Snow