From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49064) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aeOWM-0006Uu-CN for qemu-devel@nongnu.org; Fri, 11 Mar 2016 09:58:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aeOWL-0005XU-1T for qemu-devel@nongnu.org; Fri, 11 Mar 2016 09:58:30 -0500 References: <1457412306-18940-1-git-send-email-famz@redhat.com> <1457412306-18940-9-git-send-email-famz@redhat.com> From: Max Reitz Message-ID: <56E2DD08.1080907@redhat.com> Date: Fri, 11 Mar 2016 15:58:16 +0100 MIME-Version: 1.0 In-Reply-To: <1457412306-18940-9-git-send-email-famz@redhat.com> Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="6d9F2Lo6ocMWr3kCbwk9611tMDvSwTKDR" Subject: Re: [Qemu-devel] [PATCH v4 08/15] 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: kwolf@redhat.com, Vladimir Sementsov-Ogievskiy , jsnow@redhat.com, qemu-block@nongnu.org This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --6d9F2Lo6ocMWr3kCbwk9611tMDvSwTKDR Content-Type: multipart/mixed; boundary="PG6wN3JN1KspMtJUucmNekHVdvpHhQns1" From: Max Reitz To: Fam Zheng , qemu-devel@nongnu.org Cc: qemu-block@nongnu.org, Vladimir Sementsov-Ogievskiy , jsnow@redhat.com, kwolf@redhat.com Message-ID: <56E2DD08.1080907@redhat.com> Subject: Re: [PATCH v4 08/15] tests: Add test code for meta bitmap References: <1457412306-18940-1-git-send-email-famz@redhat.com> <1457412306-18940-9-git-send-email-famz@redhat.com> In-Reply-To: <1457412306-18940-9-git-send-email-famz@redhat.com> --PG6wN3JN1KspMtJUucmNekHVdvpHhQns1 Content-Type: text/plain; charset=iso-8859-15 Content-Transfer-Encoding: quoted-printable On 08.03.2016 05:44, Fam Zheng wrote: > Signed-off-by: Fam Zheng > Reviewed-by: John Snow > --- > tests/test-hbitmap.c | 116 +++++++++++++++++++++++++++++++++++++++++++= ++++++++ > 1 file changed, 116 insertions(+) >=20 > 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 > #include "qemu/hbitmap.h" > +#include "block/block.h" > =20 > #define LOG_BITS_PER_LONG (BITS_PER_LONG =3D=3D 32 ? 5 : 6) > =20 > @@ -21,6 +22,7 @@ > =20 > 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,= > } > } > =20 > +static void hbitmap_test_init_meta(TestHBitmapData *data, > + uint64_t size, int granularity, > + int meta_chunk) > +{ > + hbitmap_test_init(data, size, granularity); > + data->meta =3D hbitmap_create_meta(data->hb, meta_chunk); > +} > + > static inline size_t hbitmap_test_array_size(size_t bits) > { > size_t n =3D (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 =3D NULL; > } > @@ -635,6 +648,103 @@ static void test_hbitmap_truncate_shrink_large(Te= stHBitmapData *data, > hbitmap_test_truncate(data, size, -diff, 0); > } > =20 > +static void hbitmap_check_meta(TestHBitmapData *data, > + int64_t start, int count) > +{ > + int64_t i; > + > + for (i =3D 0; i < data->size; i++) { > + if (i >=3D 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 =3D 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_s= ize * 2); > + hbitmap_test_meta(data, chunk_size - 1, chunk_size + 2, 0, chunk_s= ize * 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 *u= nused) > +{ > + int i; > + int64_t offsets[] =3D { > + 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 =3D 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(); > =20 > return 0; >=20 --PG6wN3JN1KspMtJUucmNekHVdvpHhQns1-- --6d9F2Lo6ocMWr3kCbwk9611tMDvSwTKDR Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQEcBAEBCAAGBQJW4t0JAAoJEDuxQgLoOKytDc4H+gPrGsJSUmCLqt/iDMLnupZF AlBi9y2cx7pbtKJScNspu4DempINHG8Ikj6p98P4fFg8ziQenKccfwGjit3ecQDz AewUxiBl/7/oic3+qQFEPFinafUAkIr9iFD1L8gL2wPd9+tJNfPPqTItq6MucXL9 kIjgK1tW0h7aJq612aGjkrucpxp7ElDwGe5ukvzrH75AFWEW+bZl2disKFSeQHNj wRkjl8mcGfd0IkAlvtK8SHZw40tdd9WsLD+TK36yYnRqYoaucSTdxwfPI3SVM/l3 3XlBwDOs2qSiaZShpb0xcCPuTsi0CrhE65nqHhwjhgACF7VFJdjs7J8KjdwHqP4= =yRVt -----END PGP SIGNATURE----- --6d9F2Lo6ocMWr3kCbwk9611tMDvSwTKDR--