shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-10-28 20:25:25 +03:00
Code

Merge pull request #810 from mamikk/bitmap-fixes-v2

Browse Source 
Bitmap fixes v2
This commit is contained in:
Daniel Mack 2015-07-31 19:21:51 +02:00
commit 6ba32d1c2f
2 changed files with 33 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/basic/bitmap.c
View File

@ -145,7 +145,10 @@ bool bitmap_isclear(Bitmap *b) {
void bitmap_clear(Bitmap *b) { void bitmap_clear(Bitmap *b) {
assert(b); assert(b);
free(b->bitmaps);
b->bitmaps = NULL;
b->n_bitmaps = 0; b->n_bitmaps = 0;
b->bitmaps_allocated = 0;
} }
bool bitmap_iterate(Bitmap *b, Iterator *i, unsigned *n) { bool bitmap_iterate(Bitmap *b, Iterator *i, unsigned *n) {
@ -184,6 +187,9 @@ bool bitmap_iterate(Bitmap *b, Iterator *i, unsigned *n) {
} }
bool bitmap_equal(Bitmap *a, Bitmap *b) { bool bitmap_equal(Bitmap *a, Bitmap *b) {
size_t common_n_bitmaps;
Bitmap *c;
unsigned i;
if (!a ^ !b) if (!a ^ !b)
return false; return false;
@ -191,8 +197,14 @@ bool bitmap_equal(Bitmap *a, Bitmap *b) {
if (!a) if (!a)
return true; return true;
if (a->n_bitmaps != b->n_bitmaps) common_n_bitmaps = MIN(a->n_bitmaps, b->n_bitmaps);
if (memcmp(a->bitmaps, b->bitmaps, sizeof(uint64_t) * common_n_bitmaps) != 0)
return false; return false;
return memcmp(a->bitmaps, b->bitmaps, sizeof(uint64_t) * a->n_bitmaps) == 0; c = a->n_bitmaps > b->n_bitmaps ? a : b;
for (i = common_n_bitmaps; i < c->n_bitmaps; i++)
if (c->bitmaps[i] != 0)
return false;
return true;
} }

20
src/test/test-bitmap.c
View File

@ -20,7 +20,7 @@
#include "bitmap.h" #include "bitmap.h"
int main(int argc, const char *argv[]) { int main(int argc, const char *argv[]) {
_cleanup_bitmap_free_ Bitmap *b = NULL; _cleanup_bitmap_free_ Bitmap *b = NULL, *b2 = NULL;
Iterator it; Iterator it;
unsigned n = (unsigned) -1, i = 0; unsigned n = (unsigned) -1, i = 0;
@ -101,5 +101,23 @@ int main(int argc, const char *argv[]) {
assert_se(bitmap_set(b, (unsigned) -1) == -ERANGE); assert_se(bitmap_set(b, (unsigned) -1) == -ERANGE);
bitmap_free(b);
b = NULL;
assert_se(bitmap_ensure_allocated(&b) == 0);
assert_se(bitmap_ensure_allocated(&b2) == 0);
assert_se(bitmap_equal(b, b2));
assert_se(bitmap_set(b, 0) == 0);
bitmap_unset(b, 0);
assert_se(bitmap_equal(b, b2));
assert_se(bitmap_set(b, 1) == 0);
bitmap_clear(b);
assert_se(bitmap_equal(b, b2));
assert_se(bitmap_set(b, 0) == 0);
assert_se(bitmap_set(b2, 0) == 0);
assert_se(bitmap_equal(b, b2));
return 0; return 0;
} }