From 6ee2c599db989189e639c3de88d20045c62a1d2c Mon Sep 17 00:00:00 2001 Message-Id: <6ee2c599db989189e639c3de88d20045c62a1d2c@dist-git> From: Andrea Bolognani Date: Tue, 11 Jun 2019 10:55:01 +0200 Subject: [PATCH] util: Introduce virBitmapUnion() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andrea Bolognani Reviewed-by: Ján Tomko (cherry picked from commit 1b2ac8010cc1fe871f538b3f48c5e48213c5c074) https://bugzilla.redhat.com/show_bug.cgi?id=1716908 Signed-off-by: Andrea Bolognani Message-Id: <20190611085506.12564-2-abologna@redhat.com> Reviewed-by: Ján Tomko --- src/libvirt_private.syms | 1 + src/util/virbitmap.c | 27 +++++++++++++++++++++++++++ src/util/virbitmap.h | 4 ++++ tests/virbitmaptest.c | 38 ++++++++++++++++++++++++++++++++++++++ 4 files changed, 70 insertions(+) diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms index ee7625b0f3..05c96c29e2 100644 --- a/src/libvirt_private.syms +++ b/src/libvirt_private.syms @@ -1476,6 +1476,7 @@ virBitmapSubtract; virBitmapToData; virBitmapToDataBuf; virBitmapToString; +virBitmapUnion; # util/virbuffer.h diff --git a/src/util/virbitmap.c b/src/util/virbitmap.c index ef18dad255..49e542a4e6 100644 --- a/src/util/virbitmap.c +++ b/src/util/virbitmap.c @@ -1265,6 +1265,33 @@ virBitmapIntersect(virBitmapPtr a, } +/** + * virBitmapUnion: + * @a: bitmap, modified to contain result + * @b: other bitmap + * + * Performs union of two bitmaps: a = union(a, b) + * + * Returns 0 on success, <0 on failure. + */ +int +virBitmapUnion(virBitmapPtr a, + const virBitmap *b) +{ + size_t i; + + if (a->nbits < b->nbits && + virBitmapExpand(a, b->nbits - 1) < 0) { + return -1; + } + + for (i = 0; i < b->map_len; i++) + a->map[i] |= b->map[i]; + + return 0; +} + + /** * virBitmapSubtract: * @a: minuend/result diff --git a/src/util/virbitmap.h b/src/util/virbitmap.h index 312e7e2933..5934508d11 100644 --- a/src/util/virbitmap.h +++ b/src/util/virbitmap.h @@ -151,6 +151,10 @@ bool virBitmapOverlaps(virBitmapPtr b1, void virBitmapIntersect(virBitmapPtr a, virBitmapPtr b) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); +int virBitmapUnion(virBitmapPtr a, + const virBitmap *b) + ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); + void virBitmapSubtract(virBitmapPtr a, virBitmapPtr b) ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2); diff --git a/tests/virbitmaptest.c b/tests/virbitmaptest.c index 2fbafc0a76..cafe865dde 100644 --- a/tests/virbitmaptest.c +++ b/tests/virbitmaptest.c @@ -740,6 +740,34 @@ test14(const void *opaque) return ret; } +/* virBitmapUnion() */ +static int +test15(const void *opaque) +{ + const struct testBinaryOpData *data = opaque; + VIR_AUTOPTR(virBitmap) amap = NULL; + VIR_AUTOPTR(virBitmap) bmap = NULL; + VIR_AUTOPTR(virBitmap) resmap = NULL; + + if (!(amap = virBitmapParseUnlimited(data->a)) || + !(bmap = virBitmapParseUnlimited(data->b)) || + !(resmap = virBitmapParseUnlimited(data->res))) { + return -1; + } + + if (virBitmapUnion(amap, bmap) < 0) + return -1; + + if (!virBitmapEqual(amap, resmap)) { + fprintf(stderr, + "\n bitmap union failed: union('%s', '%s') != '%s'\n", + data->a, data->b, data->res); + return -1; + } + + return 0; +} + #define TESTBINARYOP(A, B, RES, FUNC) \ testBinaryOpData.a = A; \ @@ -798,6 +826,16 @@ mymain(void) TESTBINARYOP("0-3", "0,^0", "0-3", test14); TESTBINARYOP("0,2", "1,3", "0,2", test14); + /* virBitmapUnion() */ + virTestCounterReset("test15-"); + TESTBINARYOP("0-1", "0-1", "0-1", test15); + TESTBINARYOP("0", "1", "0-1", test15); + TESTBINARYOP("0-1", "2-3", "0-3", test15); + TESTBINARYOP("0-3", "1-2", "0-3", test15); + TESTBINARYOP("0,^0", "12345", "12345", test15); + TESTBINARYOP("12345", "0,^0", "12345", test15); + TESTBINARYOP("0,^0", "0,^0", "0,^0", test15); + return ret; } -- 2.22.0