From: Jeff King <peff@xxxxxxxx>
If you ask to set a bit in the Nth word and we haven't yet allocated
that many slots in our array, we'll increase the bitmap size to 2*N.
This means we might frequently end up with bitmaps that are twice the
necessary size (as soon as you ask for the biggest bit, we'll size up to
twice that).
But if we just allocate as many words as were asked for, we may not grow
fast enough. The worst case there is setting bit 0, then 1, etc. Each
time we grow we'd just extend by one more word, giving us linear
reallocations (and quadratic memory copies).
Let's combine those by allocating the maximum of:
- what the caller asked for
- a geometric increase in existing size; we'll switch to 3/2 instead of
2 here. That's less aggressive and may help avoid fragmenting memory
(N + 3N/2 > 9N/4, so old chunks can be reused as we scale up).
Our worst case is still 3/2N wasted bits (you set bit N-1, then setting
bit N causes us to grow by 3/2), but our average should be much better.
This isn't usually that big a deal, but it will matter as we shift the
reachability bitmap generation code to store more bitmaps in memory.
Signed-off-by: Jeff King <peff@xxxxxxxx>
Signed-off-by: Taylor Blau <me@xxxxxxxxxxxx>
---
ewah/bitmap.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/ewah/bitmap.c b/ewah/bitmap.c
index 7c1ecfa6fd..43a59d7fed 100644
--- a/ewah/bitmap.c
+++ b/ewah/bitmap.c
@@ -39,7 +39,9 @@ static void bitmap_grow(struct bitmap *self, size_t word_alloc)
{
if (word_alloc > self->word_alloc) {
size_t old_size = self->word_alloc;
- self->word_alloc = word_alloc * 2;
+ self->word_alloc = old_size * 3 / 2;
+ if (word_alloc > self->word_alloc)
+ self->word_alloc = word_alloc;
REALLOC_ARRAY(self->words, self->word_alloc);
memset(self->words + old_size, 0x0,
(self->word_alloc - old_size) * sizeof(eword_t));
--
2.29.2.156.gc03786897f
