From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52314) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YdzPw-0007lf-3m for qemu-devel@nongnu.org; Fri, 03 Apr 2015 07:05:44 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YdzPu-0003u4-TT for qemu-devel@nongnu.org; Fri, 03 Apr 2015 07:05:40 -0400 Message-ID: <551E73F0.5060704@redhat.com> Date: Fri, 03 Apr 2015 13:05:20 +0200 From: Paolo Bonzini MIME-Version: 1.0 References: <1428055280-12015-1-git-send-email-wency@cn.fujitsu.com> <1428055280-12015-11-git-send-email-wency@cn.fujitsu.com> In-Reply-To: <1428055280-12015-11-git-send-email-wency@cn.fujitsu.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH COLO v3 10/14] util/hbitmap: Add an API to reset all set bits in hbitmap List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Wen Congyang , qemu devel , Fam Zheng , Max Reitz Cc: Kevin Wolf , Lai Jiangshan , qemu block , Jiang Yunhong , Dong Eddie , "Dr. David Alan Gilbert" , Gonglei , Stefan Hajnoczi , Yang Hongyang , zhanghailiang On 03/04/2015 12:01, Wen Congyang wrote: > Signed-off-by: Wen Congyang > Signed-off-by: zhanghailiang > Signed-off-by: Gonglei > --- > include/qemu/hbitmap.h | 8 ++++++++ > tests/test-hbitmap.c | 39 +++++++++++++++++++++++++++++++++++++++ > util/hbitmap.c | 16 ++++++++++++++++ > 3 files changed, 63 insertions(+) > > diff --git a/include/qemu/hbitmap.h b/include/qemu/hbitmap.h > index 550d7ce..95a55e4 100644 > --- a/include/qemu/hbitmap.h > +++ b/include/qemu/hbitmap.h > @@ -109,6 +109,14 @@ void hbitmap_set(HBitmap *hb, uint64_t start, uint64_t count); > void hbitmap_reset(HBitmap *hb, uint64_t start, uint64_t count); > > /** > + * hbitmap_reset_all: > + * @hb: HBitmap to operate on. > + * > + * Reset all bits in an HBitmap. > + */ > +void hbitmap_reset_all(HBitmap *hb); > + > +/** > * hbitmap_get: > * @hb: HBitmap to operate on. > * @item: Bit to query (0-based). > diff --git a/tests/test-hbitmap.c b/tests/test-hbitmap.c > index 8c902f2..1f0078a 100644 > --- a/tests/test-hbitmap.c > +++ b/tests/test-hbitmap.c > @@ -11,6 +11,7 @@ > > #include > #include > +#include > #include "qemu/hbitmap.h" > > #define LOG_BITS_PER_LONG (BITS_PER_LONG == 32 ? 5 : 6) > @@ -143,6 +144,23 @@ static void hbitmap_test_reset(TestHBitmapData *data, > } > } > > +static void hbitmap_test_reset_all(TestHBitmapData *data) > +{ > + size_t n; > + > + hbitmap_reset_all(data->hb); > + > + n = (data->size + BITS_PER_LONG - 1) / BITS_PER_LONG; > + if (n == 0) { > + n = 1; > + } > + memset(data->bits, 0, n * sizeof(unsigned long)); > + > + if (data->granularity == 0) { > + hbitmap_test_check(data, 0); > + } > +} > + > static void hbitmap_test_check_get(TestHBitmapData *data) > { > uint64_t count = 0; > @@ -323,6 +341,26 @@ static void test_hbitmap_reset(TestHBitmapData *data, > hbitmap_test_set(data, L3 / 2, L3); > } > > +static void test_hbitmap_reset_all(TestHBitmapData *data, > + const void *unused) > +{ > + hbitmap_test_init(data, L3 * 2, 0); > + hbitmap_test_set(data, L1 - 1, L1 + 2); > + hbitmap_test_reset_all(data); > + hbitmap_test_set(data, 0, L1 * 3); > + hbitmap_test_reset_all(data); > + hbitmap_test_set(data, L2, L1); > + hbitmap_test_reset_all(data); > + hbitmap_test_set(data, L2, L3 - L2 + 1); > + hbitmap_test_reset_all(data); > + hbitmap_test_set(data, L3 - 1, 3); > + hbitmap_test_reset_all(data); > + hbitmap_test_set(data, 0, L3 * 2); > + hbitmap_test_reset_all(data); > + hbitmap_test_set(data, L3 / 2, L3); > + hbitmap_test_reset_all(data); > +} > + > static void test_hbitmap_granularity(TestHBitmapData *data, > const void *unused) > { > @@ -394,6 +432,7 @@ int main(int argc, char **argv) > hbitmap_test_add("/hbitmap/set/overlap", test_hbitmap_set_overlap); > hbitmap_test_add("/hbitmap/reset/empty", test_hbitmap_reset_empty); > hbitmap_test_add("/hbitmap/reset/general", test_hbitmap_reset); > + hbitmap_test_add("/hbitmap/reset/all", test_hbitmap_reset_all); > hbitmap_test_add("/hbitmap/granularity", test_hbitmap_granularity); > g_test_run(); > > diff --git a/util/hbitmap.c b/util/hbitmap.c > index ab13971..acce93c 100644 > --- a/util/hbitmap.c > +++ b/util/hbitmap.c > @@ -353,6 +353,22 @@ void hbitmap_reset(HBitmap *hb, uint64_t start, uint64_t count) > hb_reset_between(hb, HBITMAP_LEVELS - 1, start, last); > } > > +void hbitmap_reset_all(HBitmap *hb) > +{ > + uint64_t size = hb->size; > + unsigned int i; > + > + /* Same as hbitmap_alloc() except memset() */ > + for (i = HBITMAP_LEVELS; --i >= 1; ) { > + size = MAX((size + BITS_PER_LONG - 1) >> BITS_PER_LEVEL, 1); > + memset(hb->levels[i], 0, size * sizeof(unsigned long)); > + } > + > + assert(size == 1); > + hb->levels[0][0] = 1UL << (BITS_PER_LONG - 1); > + hb->count = 0; > +} > + > bool hbitmap_get(const HBitmap *hb, uint64_t item) > { > /* Compute position and bit in the last layer. */ > Acked-by: Paolo Bonzini