summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorJason Evans <je@fb.com>2016-02-26 21:59:41 (GMT)
committerJason Evans <je@fb.com>2016-02-26 22:21:10 (GMT)
commit01ecdf32d657f9e19f84ba9785c9954734666a9c (patch)
treea1db6bc2d153aa89010b48f605f631a0fe23dfc4 /test
parent4c4ee292e411b0b2381e7b5e8f7c34d480cda99a (diff)
downloadjemalloc-01ecdf32d657f9e19f84ba9785c9954734666a9c.zip
jemalloc-01ecdf32d657f9e19f84ba9785c9954734666a9c.tar.gz
jemalloc-01ecdf32d657f9e19f84ba9785c9954734666a9c.tar.bz2
Miscellaneous bitmap refactoring.
Diffstat (limited to 'test')
-rw-r--r--test/unit/bitmap.c22
1 files changed, 13 insertions, 9 deletions
diff --git a/test/unit/bitmap.c b/test/unit/bitmap.c
index 7da583d..1ab0bb8 100644
--- a/test/unit/bitmap.c
+++ b/test/unit/bitmap.c
@@ -6,7 +6,11 @@ TEST_BEGIN(test_bitmap_size)
prev_size = 0;
for (i = 1; i <= BITMAP_MAXBITS; i++) {
- size_t size = bitmap_size(i);
+ bitmap_info_t binfo;
+ size_t size;
+
+ bitmap_info_init(&binfo, i);
+ size = bitmap_size(&binfo);
assert_true(size >= prev_size,
"Bitmap size is smaller than expected");
prev_size = size;
@@ -23,8 +27,8 @@ TEST_BEGIN(test_bitmap_init)
bitmap_info_init(&binfo, i);
{
size_t j;
- bitmap_t *bitmap = (bitmap_t *)malloc(sizeof(bitmap_t) *
- bitmap_info_ngroups(&binfo));
+ bitmap_t *bitmap = (bitmap_t *)malloc(
+ bitmap_size(&binfo));
bitmap_init(bitmap, &binfo);
for (j = 0; j < i; j++) {
@@ -46,8 +50,8 @@ TEST_BEGIN(test_bitmap_set)
bitmap_info_init(&binfo, i);
{
size_t j;
- bitmap_t *bitmap = (bitmap_t *)malloc(sizeof(bitmap_t) *
- bitmap_info_ngroups(&binfo));
+ bitmap_t *bitmap = (bitmap_t *)malloc(
+ bitmap_size(&binfo));
bitmap_init(bitmap, &binfo);
for (j = 0; j < i; j++)
@@ -69,8 +73,8 @@ TEST_BEGIN(test_bitmap_unset)
bitmap_info_init(&binfo, i);
{
size_t j;
- bitmap_t *bitmap = (bitmap_t *)malloc(sizeof(bitmap_t) *
- bitmap_info_ngroups(&binfo));
+ bitmap_t *bitmap = (bitmap_t *)malloc(
+ bitmap_size(&binfo));
bitmap_init(bitmap, &binfo);
for (j = 0; j < i; j++)
@@ -98,8 +102,8 @@ TEST_BEGIN(test_bitmap_sfu)
bitmap_info_init(&binfo, i);
{
ssize_t j;
- bitmap_t *bitmap = (bitmap_t *)malloc(sizeof(bitmap_t) *
- bitmap_info_ngroups(&binfo));
+ bitmap_t *bitmap = (bitmap_t *)malloc(
+ bitmap_size(&binfo));
bitmap_init(bitmap, &binfo);
/* Iteratively set bits starting at the beginning. */