Commit be58721d authored by John Snow's avatar John Snow Committed by Kevin Wolf
Browse files

hbitmap: add hbitmap_merge 



We add a bitmap merge operation to assist in error cases
where we wish to combine two bitmaps together.

This is algorithmically O(bits) provided HBITMAP_LEVELS remains
constant. For a full bitmap on a 64bit machine:
sum(bits/64^k, k, 0, HBITMAP_LEVELS) ~= 1.01587 * bits

We may be able to improve running speed for particularly sparse
bitmaps by using iterators, but the running time for dense maps
will be worse.

We present the simpler solution first, and we can refine it later
if needed.

Signed-off-by: default avatarJohn Snow <jsnow@redhat.com>
Reviewed-by: default avatarMax Reitz <mreitz@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Reviewed-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Message-id: 1429314609-29776-8-git-send-email-jsnow@redhat.com
Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent 8515efbe

include/qemu/hbitmap.h

+13 −0
Original line number Diff line number Diff line
@@ -64,6 +64,19 @@ struct HBitmapIter { 
 */

HBitmap *hbitmap_alloc(uint64_t size, int granularity);



/**

 * hbitmap_merge:

 * @a: The bitmap to store the result in.

 * @b: The bitmap to merge into @a.

 * @return true if the merge was successful,

 *         false if it was not attempted.

 *

 * Merge two bitmaps together.

 * A := A (BITOR) B.

 * B is left unmodified.

 */

bool hbitmap_merge(HBitmap *a, const HBitmap *b);



/**

 * hbitmap_empty:

 * @hb: HBitmap to operate on.

util/hbitmap.c

+33 −0
Original line number Diff line number Diff line
@@ -399,3 +399,36 @@ HBitmap *hbitmap_alloc(uint64_t size, int granularity) 
    hb->levels[0][0] |= 1UL << (BITS_PER_LONG - 1);

    return hb;

}



/**

 * Given HBitmaps A and B, let A := A (BITOR) B.

 * Bitmap B will not be modified.

 *

 * @return true if the merge was successful,

 *         false if it was not attempted.

 */

bool hbitmap_merge(HBitmap *a, const HBitmap *b)

{

    int i;

    uint64_t j;



    if ((a->size != b->size) || (a->granularity != b->granularity)) {

        return false;

    }



    if (hbitmap_count(b) == 0) {

        return true;

    }



    /* This merge is O(size), as BITS_PER_LONG and HBITMAP_LEVELS are constant.

     * It may be possible to improve running times for sparsely populated maps

     * by using hbitmap_iter_next, but this is suboptimal for dense maps.

     */

    for (i = HBITMAP_LEVELS - 1; i >= 0; i--) {

        for (j = 0; j < a->sizes[i]; j++) {

            a->levels[i][j] |= b->levels[i][j];

        }

    }



    return true;

}