summaryrefslogtreecommitdiff
path: root/deps/jemalloc/test/bitmap.c
diff options
context:
space:
mode:
authorantirez <antirez@gmail.com>2012-05-15 15:27:12 +0200
committerantirez <antirez@gmail.com>2012-05-16 11:20:44 +0200
commit4934f93dfb30c93a1636e3227584e791cd062bfb (patch)
treee9638d1b4ec236754b01cc42023eddb3b208a551 /deps/jemalloc/test/bitmap.c
parent14beba7868048bab2233066f18e08c18b8d7afea (diff)
downloadredis-4934f93dfb30c93a1636e3227584e791cd062bfb.tar.gz
Jemalloc updated to 3.0.0.
Full changelog here: http://www.canonware.com/cgi-bin/gitweb.cgi?p=jemalloc.git;a=blob_plain;f=ChangeLog;hb=master Notable improvements from the point of view of Redis: 1) Bugfixing. 2) Support for Valgrind. 3) Support for OSX Lion, FreeBSD.
Diffstat (limited to 'deps/jemalloc/test/bitmap.c')
-rw-r--r--deps/jemalloc/test/bitmap.c32
1 files changed, 14 insertions, 18 deletions
diff --git a/deps/jemalloc/test/bitmap.c b/deps/jemalloc/test/bitmap.c
index adfaacfe5..b2cb63004 100644
--- a/deps/jemalloc/test/bitmap.c
+++ b/deps/jemalloc/test/bitmap.c
@@ -1,18 +1,6 @@
#define JEMALLOC_MANGLE
#include "jemalloc_test.h"
-/*
- * Avoid using the assert() from jemalloc_internal.h, since it requires
- * internal libjemalloc functionality.
- * */
-#include <assert.h>
-
-/*
- * Directly include the bitmap code, since it isn't exposed outside
- * libjemalloc.
- */
-#include "../src/bitmap.c"
-
#if (LG_BITMAP_MAXBITS > 12)
# define MAXBITS 4500
#else
@@ -42,11 +30,13 @@ test_bitmap_init(void)
bitmap_info_init(&binfo, i);
{
size_t j;
- bitmap_t bitmap[bitmap_info_ngroups(&binfo)];
+ bitmap_t *bitmap = malloc(sizeof(bitmap_t) *
+ bitmap_info_ngroups(&binfo));
bitmap_init(bitmap, &binfo);
for (j = 0; j < i; j++)
assert(bitmap_get(bitmap, &binfo, j) == false);
+ free(bitmap);
}
}
@@ -62,12 +52,14 @@ test_bitmap_set(void)
bitmap_info_init(&binfo, i);
{
size_t j;
- bitmap_t bitmap[bitmap_info_ngroups(&binfo)];
+ bitmap_t *bitmap = malloc(sizeof(bitmap_t) *
+ bitmap_info_ngroups(&binfo));
bitmap_init(bitmap, &binfo);
for (j = 0; j < i; j++)
bitmap_set(bitmap, &binfo, j);
assert(bitmap_full(bitmap, &binfo));
+ free(bitmap);
}
}
}
@@ -82,7 +74,8 @@ test_bitmap_unset(void)
bitmap_info_init(&binfo, i);
{
size_t j;
- bitmap_t bitmap[bitmap_info_ngroups(&binfo)];
+ bitmap_t *bitmap = malloc(sizeof(bitmap_t) *
+ bitmap_info_ngroups(&binfo));
bitmap_init(bitmap, &binfo);
for (j = 0; j < i; j++)
@@ -93,6 +86,7 @@ test_bitmap_unset(void)
for (j = 0; j < i; j++)
bitmap_set(bitmap, &binfo, j);
assert(bitmap_full(bitmap, &binfo));
+ free(bitmap);
}
}
}
@@ -107,7 +101,8 @@ test_bitmap_sfu(void)
bitmap_info_init(&binfo, i);
{
ssize_t j;
- bitmap_t bitmap[bitmap_info_ngroups(&binfo)];
+ bitmap_t *bitmap = malloc(sizeof(bitmap_t) *
+ bitmap_info_ngroups(&binfo));
bitmap_init(bitmap, &binfo);
/* Iteratively set bits starting at the beginning. */
@@ -137,6 +132,7 @@ test_bitmap_sfu(void)
}
assert(bitmap_sfu(bitmap, &binfo) == i - 1);
assert(bitmap_full(bitmap, &binfo));
+ free(bitmap);
}
}
}
@@ -144,7 +140,7 @@ test_bitmap_sfu(void)
int
main(void)
{
- fprintf(stderr, "Test begin\n");
+ malloc_printf("Test begin\n");
test_bitmap_size();
test_bitmap_init();
@@ -152,6 +148,6 @@ main(void)
test_bitmap_unset();
test_bitmap_sfu();
- fprintf(stderr, "Test end\n");
+ malloc_printf("Test end\n");
return (0);
}