From: John Snow <jsnow@redhat.com>
To: Fam Zheng <famz@redhat.com>, qemu-devel@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>, Jeff Cody <jcody@redhat.com>,
Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>,
qemu-block@nongnu.org
Subject: Re: [Qemu-devel] [PATCH v2 13/13] tests: Add test code for hbitmap serialization
Date: Tue, 26 Jan 2016 12:10:49 -0500 [thread overview]
Message-ID: <56A7A899.4060902@redhat.com> (raw)
In-Reply-To: <1453270306-16608-14-git-send-email-famz@redhat.com>
On 01/20/2016 01:11 AM, Fam Zheng wrote:
> Signed-off-by: Fam Zheng <famz@redhat.com>
Looks OK at 10,000 feet.
Acked-by: John Snow <jsnow@redhat.com>
> ---
> tests/test-hbitmap.c | 139 +++++++++++++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 139 insertions(+)
>
> diff --git a/tests/test-hbitmap.c b/tests/test-hbitmap.c
> index a341803..9b89751 100644
> --- a/tests/test-hbitmap.c
> +++ b/tests/test-hbitmap.c
> @@ -14,6 +14,7 @@
> #include <string.h>
> #include <sys/types.h>
> #include "qemu/hbitmap.h"
> +#include "qemu/bitmap.h"
> #include "block/block.h"
>
> #define LOG_BITS_PER_LONG (BITS_PER_LONG == 32 ? 5 : 6)
> @@ -740,6 +741,16 @@ static void test_hbitmap_meta_one(TestHBitmapData *data, const void *unused)
> }
> }
>
> +static void test_hbitmap_serialize_granularity(TestHBitmapData *data,
> + const void *unused)
> +{
> + int r;
> +
> + hbitmap_test_init(data, L3 * 2, 3);
> + r = hbitmap_serialization_granularity(data->hb);
> + g_assert_cmpint(r, ==, BITS_PER_LONG << 3);
> +}
> +
> static void test_hbitmap_meta_zero(TestHBitmapData *data, const void *unused)
> {
> hbitmap_test_init_meta(data, 0, 0, 1);
> @@ -747,6 +758,125 @@ static void test_hbitmap_meta_zero(TestHBitmapData *data, const void *unused)
> hbitmap_check_meta(data, 0, 0);
> }
>
> +static void hbitmap_test_serialize_range(TestHBitmapData *data,
> + uint8_t *buf, size_t buf_size,
> + uint64_t pos, uint64_t count)
> +{
> + size_t i;
> +
> + assert(hbitmap_granularity(data->hb) == 0);
> + hbitmap_reset_all(data->hb);
> + memset(buf, 0, buf_size);
> + if (count) {
> + hbitmap_set(data->hb, pos, count);
> + }
> + hbitmap_serialize_part(data->hb, buf, 0, data->size);
> + for (i = 0; i < data->size; i++) {
> + int is_set = test_bit(i, (unsigned long *)buf);
> + if (i >= pos && i < pos + count) {
> + g_assert(is_set);
> + } else {
> + g_assert(!is_set);
> + }
> + }
> + hbitmap_reset_all(data->hb);
> + hbitmap_deserialize_part(data->hb, buf, 0, data->size, true);
> +
> + for (i = 0; i < data->size; i++) {
> + int is_set = hbitmap_get(data->hb, i);
> + if (i >= pos && i < pos + count) {
> + g_assert(is_set);
> + } else {
> + g_assert(!is_set);
> + }
> + }
> +}
> +
> +static void test_hbitmap_serialize_basic(TestHBitmapData *data,
> + const void *unused)
> +{
> + int i, j;
> + size_t buf_size;
> + uint8_t *buf;
> + uint64_t positions[] = { 0, 1, L1 - 1, L1, L2 - 1, L2, L2 + 1, L3 - 1 };
> + int num_positions = sizeof(positions) / sizeof(positions[0]);
> +
> + hbitmap_test_init(data, L3, 0);
> + buf_size = hbitmap_serialization_size(data->hb, 0, data->size);
> + buf = g_malloc0(buf_size);
> +
> + for (i = 0; i < num_positions; i++) {
> + for (j = 0; j < num_positions; j++) {
> + hbitmap_test_serialize_range(data, buf, buf_size,
> + positions[i],
> + MIN(positions[j], L3 - positions[i]));
> + }
> + }
> +
> + g_free(buf);
> +}
> +
> +static void test_hbitmap_serialize_part(TestHBitmapData *data,
> + const void *unused)
> +{
> + int i, j, k;
> + size_t buf_size;
> + uint8_t *buf;
> + uint64_t positions[] = { 0, 1, L1 - 1, L1, L2 - 1, L2, L2 + 1, L3 - 1 };
> + int num_positions = sizeof(positions) / sizeof(positions[0]);
> +
> + hbitmap_test_init(data, L3, 0);
> + buf_size = L2;
> + buf = g_malloc0(buf_size);
> +
> + for (i = 0; i < num_positions; i++) {
> + hbitmap_set(data->hb, positions[i], 1);
> + }
> +
> + for (i = 0; i < data->size; i += buf_size) {
> + hbitmap_serialize_part(data->hb, buf, i, buf_size);
> + for (j = 0; j < buf_size; j++) {
> + bool should_set = false;
> + for (k = 0; k < num_positions; k++) {
> + if (positions[k] == j + i) {
> + should_set = true;
> + break;
> + }
> + }
> + g_assert_cmpint(should_set, ==, test_bit(j, (unsigned long *)buf));
> + }
> + }
> +
> + g_free(buf);
> +}
> +
> +static void test_hbitmap_serialize_zeroes(TestHBitmapData *data,
> + const void *unused)
> +{
> + int i;
> + HBitmapIter iter;
> + int64_t next;
> + uint64_t positions[] = { 0, L1, L2, L3 - L1};
> + int num_positions = sizeof(positions) / sizeof(positions[0]);
> +
> + hbitmap_test_init(data, L3, 0);
> +
> + for (i = 0; i < num_positions; i++) {
> + hbitmap_set(data->hb, positions[i], L1);
> + }
> +
> + for (i = 0; i < num_positions; i++) {
> + hbitmap_deserialize_zeroes(data->hb, positions[i], L1, true);
> + hbitmap_iter_init(&iter, data->hb, 0);
> + next = hbitmap_iter_next(&iter);
> + if (i == num_positions - 1) {
> + g_assert_cmpint(next, ==, -1);
> + } else {
> + g_assert_cmpint(next, ==, positions[i + 1]);
> + }
> + }
> +}
> +
> static void hbitmap_test_add(const char *testpath,
> void (*test_func)(TestHBitmapData *data, const void *user_data))
> {
> @@ -802,6 +932,15 @@ int main(int argc, char **argv)
> 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);
> +
> + hbitmap_test_add("/hbitmap/serialize/granularity",
> + test_hbitmap_serialize_granularity);
> + hbitmap_test_add("/hbitmap/serialize/basic",
> + test_hbitmap_serialize_basic);
> + hbitmap_test_add("/hbitmap/serialize/part",
> + test_hbitmap_serialize_part);
> + hbitmap_test_add("/hbitmap/serialize/zeroes",
> + test_hbitmap_serialize_zeroes);
> g_test_run();
>
> return 0;
>
next prev parent reply other threads:[~2016-01-26 17:11 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-20 6:11 [Qemu-devel] [PATCH v2 00/13] Dirty bitmap changes for migration/persistence work Fam Zheng
2016-01-20 6:11 ` [Qemu-devel] [PATCH v2 01/13] backup: Use Bitmap to replace "s->bitmap" Fam Zheng
2016-01-20 6:11 ` [Qemu-devel] [PATCH v2 02/13] typedefs: Add BdrvDirtyBitmap Fam Zheng
2016-01-20 16:56 ` Eric Blake
2016-01-21 3:05 ` Fam Zheng
2016-01-25 20:37 ` John Snow
2016-01-20 6:11 ` [Qemu-devel] [PATCH v2 03/13] block: Move block dirty bitmap code to separate files Fam Zheng
2016-01-22 9:13 ` Vladimir Sementsov-Ogievskiy
2016-01-20 6:11 ` [Qemu-devel] [PATCH v2 04/13] block: Remove unused typedef of BlockDriverDirtyHandler Fam Zheng
2016-01-20 6:11 ` [Qemu-devel] [PATCH v2 05/13] block: Hide HBitmap in block dirty bitmap interface Fam Zheng
2016-01-26 16:02 ` Vladimir Sementsov-Ogievskiy
2016-02-27 8:30 ` Fam Zheng
2016-01-20 6:11 ` [Qemu-devel] [PATCH v2 06/13] HBitmap: Introduce "meta" bitmap to track bit changes Fam Zheng
2016-01-25 22:02 ` John Snow
2016-01-20 6:11 ` [Qemu-devel] [PATCH v2 07/13] tests: Add test code for meta bitmap Fam Zheng
2016-01-20 6:11 ` [Qemu-devel] [PATCH v2 08/13] block: Support meta dirty bitmap Fam Zheng
2016-01-22 11:34 ` Vladimir Sementsov-Ogievskiy
2016-01-26 4:31 ` Fam Zheng
2016-01-22 11:58 ` Vladimir Sementsov-Ogievskiy
2016-01-22 12:05 ` Vladimir Sementsov-Ogievskiy
2016-01-26 6:25 ` Fam Zheng
2016-01-26 7:49 ` Vladimir Sementsov-Ogievskiy
2016-01-26 8:23 ` Fam Zheng
2016-01-25 22:16 ` John Snow
2016-01-20 6:11 ` [Qemu-devel] [PATCH v2 09/13] block: Add two dirty bitmap getters Fam Zheng
2016-01-22 11:45 ` Vladimir Sementsov-Ogievskiy
2016-01-26 4:19 ` Fam Zheng
2016-01-20 6:11 ` [Qemu-devel] [PATCH v2 10/13] block: Assert that bdrv_release_dirty_bitmap succeeded Fam Zheng
2016-01-20 6:11 ` [Qemu-devel] [PATCH v2 11/13] hbitmap: serialization Fam Zheng
2016-01-26 17:01 ` John Snow
2016-02-27 8:55 ` Fam Zheng
2016-01-20 6:11 ` [Qemu-devel] [PATCH v2 12/13] block: BdrvDirtyBitmap serialization interface Fam Zheng
2016-01-26 17:07 ` John Snow
2016-01-20 6:11 ` [Qemu-devel] [PATCH v2 13/13] tests: Add test code for hbitmap serialization Fam Zheng
2016-01-26 17:10 ` John Snow [this message]
2016-01-20 16:13 ` [Qemu-devel] [PATCH v2 00/13] Dirty bitmap changes for migration/persistence work Vladimir Sementsov-Ogievskiy
2016-01-22 12:07 ` Vladimir Sementsov-Ogievskiy
2016-01-21 10:41 ` Vladimir Sementsov-Ogievskiy
2016-01-21 13:03 ` Fam Zheng
2016-01-26 7:26 ` [Qemu-devel] [PATCH v2 14/13] block: More operations for meta dirty bitmap Fam Zheng
2016-01-27 14:57 ` Vladimir Sementsov-Ogievskiy
2016-02-27 8:35 ` Fam Zheng
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=56A7A899.4060902@redhat.com \
--to=jsnow@redhat.com \
--cc=famz@redhat.com \
--cc=jcody@redhat.com \
--cc=kwolf@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=vsementsov@virtuozzo.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.