X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Falloc%2Ftest%2Frun.c;h=a6d021ff9e5dc87b3d1f25cf821fc15215031208;hp=801db5762443da6840f733928ba3a82dbb75e65c;hb=bbd7380019f3ea4629d170af24b902bf734c83ea;hpb=85a33135890965218010b79c89e4d3f4905727e3

diff --git a/ccan/alloc/test/run.c b/ccan/alloc/test/run.c
index 801db576..a6d021ff 100644
--- a/ccan/alloc/test/run.c
+++ b/ccan/alloc/test/run.c
@@ -1,12 +1,11 @@
 #include <ccan/alloc/alloc.h>
 #include <ccan/tap/tap.h>
 #include <ccan/alloc/alloc.c>
+#include <ccan/alloc/bitops.c>
+#include <ccan/alloc/tiny.c>
 #include <stdlib.h>
 #include <err.h>
 
-#define POOL_ORD 16
-#define POOL_SIZE (1 << POOL_ORD)
-
 #define sort(p, num, cmp) \
 	qsort((p), (num), sizeof(*p), (int(*)(const void *, const void *))cmp)
 
@@ -25,36 +24,33 @@ static bool unique(void *p[], unsigned int num)
 	return true;
 }	
 
-static bool free_every_second_one(void *mem, unsigned int num, void *p[])
+static bool free_every_second_one(void *mem, unsigned int num, 
+				  unsigned long pool_size, void *p[])
 {
 	unsigned int i;
 
 	/* Free every second one. */
 	for (i = 0; i < num; i += 2) {
-		alloc_free(mem, POOL_SIZE, p[i]);
-		if (!alloc_check(mem, POOL_SIZE))
-			return false;
+		alloc_free(mem, pool_size, p[i]);
 	}
+	if (!alloc_check(mem, pool_size))
+		return false;
 	for (i = 1; i < num; i += 2) {
-		alloc_free(mem, POOL_SIZE, p[i]);
-		if (!alloc_check(mem, POOL_SIZE))
-			return false;
+		alloc_free(mem, pool_size, p[i]);
 	}
+	if (!alloc_check(mem, pool_size))
+		return false;
 	return true;
 }
 
-
-int main(int argc, char *argv[])
+static void test(unsigned int pool_size)
 {
 	void *mem;
 	unsigned int i, num, max_size;
-	void *p[POOL_SIZE];
+	void **p = calloc(pool_size, sizeof(*p));
+	unsigned alloc_limit = pool_size / 2;
 
-	plan_tests(178);
-
-	/* FIXME: Needs to be page aligned for now. */
-	if (posix_memalign(&mem, 1 << POOL_ORD, POOL_SIZE) != 0)
-		errx(1, "Failed allocating aligned memory"); 
+	mem = malloc(pool_size);
 
 	/* Small pool, all allocs fail, even 0-length. */
 	alloc_init(mem, 0);
@@ -66,33 +62,33 @@ int main(int argc, char *argv[])
 	/* Free of NULL should work. */
 	alloc_free(mem, 0, NULL);
 
-	alloc_init(mem, POOL_SIZE);
-	ok1(alloc_check(mem, POOL_SIZE));
+	alloc_init(mem, pool_size);
+	ok1(alloc_check(mem, pool_size));
 	/* Find largest allocation which works. */
-	for (max_size = POOL_SIZE * 2; max_size; max_size--) {
-		p[0] = alloc_get(mem, POOL_SIZE, max_size, 1);
+	for (max_size = pool_size + 1; max_size; max_size--) {
+		p[0] = alloc_get(mem, pool_size, max_size, 1);
 		if (p[0])
 			break;
 	}
-	ok1(max_size < POOL_SIZE);
+	ok1(max_size < pool_size);
 	ok1(max_size > 0);
-	ok1(alloc_check(mem, POOL_SIZE));
-	ok1(alloc_size(mem, POOL_SIZE, p[0]) >= max_size);
+	ok1(alloc_check(mem, pool_size));
+	ok1(alloc_size(mem, pool_size, p[0]) >= max_size);
 
 	/* Free it, should be able to reallocate it. */
-	alloc_free(mem, POOL_SIZE, p[0]);
-	ok1(alloc_check(mem, POOL_SIZE));
+	alloc_free(mem, pool_size, p[0]);
+	ok1(alloc_check(mem, pool_size));
 
-	p[0] = alloc_get(mem, POOL_SIZE, max_size, 1);
+	p[0] = alloc_get(mem, pool_size, max_size, 1);
 	ok1(p[0]);
-	ok1(alloc_size(mem, POOL_SIZE, p[0]) >= max_size);
-	ok1(alloc_check(mem, POOL_SIZE));
-	alloc_free(mem, POOL_SIZE, p[0]);
-	ok1(alloc_check(mem, POOL_SIZE));
+	ok1(alloc_size(mem, pool_size, p[0]) >= max_size);
+	ok1(alloc_check(mem, pool_size));
+	alloc_free(mem, pool_size, p[0]);
+	ok1(alloc_check(mem, pool_size));
 
 	/* Allocate a whole heap. */
-	for (i = 0; i < POOL_SIZE; i++) {
-		p[i] = alloc_get(mem, POOL_SIZE, 1, 1);
+	for (i = 0; i < pool_size; i++) {
+		p[i] = alloc_get(mem, pool_size, 1, 1);
 		if (!p[i])
 			break;
 	}
@@ -100,13 +96,13 @@ int main(int argc, char *argv[])
 	/* Uncomment this for a more intuitive view of what the
 	 * allocator looks like after all these 1 byte allocs. */
 #if 0
-	alloc_visualize(stderr, mem, POOL_SIZE);
+	alloc_visualize(stderr, mem, pool_size);
 #endif
 
 	num = i;
 	/* Can't allocate this many. */
-	ok1(num != POOL_SIZE);
-	ok1(alloc_check(mem, POOL_SIZE));
+	ok1(num != pool_size);
+	ok1(alloc_check(mem, pool_size));
 
 	/* Sort them. */
 	sort(p, num, addr_cmp);
@@ -114,94 +110,67 @@ int main(int argc, char *argv[])
 	/* Uniqueness check */
 	ok1(unique(p, num));
 
-	ok1(free_every_second_one(mem, num, p));
-	ok1(alloc_check(mem, POOL_SIZE));
+	ok1(free_every_second_one(mem, num, pool_size, p));
+	ok1(alloc_check(mem, pool_size));
 
 	/* Should be able to reallocate max size. */
-	p[0] = alloc_get(mem, POOL_SIZE, max_size, 1);
+	p[0] = alloc_get(mem, pool_size, max_size, 1);
 	ok1(p[0]);
-	ok1(alloc_check(mem, POOL_SIZE));
-	ok1(alloc_size(mem, POOL_SIZE, p[0]) >= max_size);
+	ok1(alloc_check(mem, pool_size));
+	ok1(alloc_size(mem, pool_size, p[0]) >= max_size);
 
 	/* Re-initializing should be the same as freeing everything */
-	alloc_init(mem, POOL_SIZE);
-	ok1(alloc_check(mem, POOL_SIZE));
-	p[0] = alloc_get(mem, POOL_SIZE, max_size, 1);
+	alloc_init(mem, pool_size);
+	ok1(alloc_check(mem, pool_size));
+	p[0] = alloc_get(mem, pool_size, max_size, 1);
 	ok1(p[0]);
-	ok1(alloc_size(mem, POOL_SIZE, p[0]) >= max_size);
-	ok1(alloc_check(mem, POOL_SIZE));
-	alloc_free(mem, POOL_SIZE, p[0]);
-	ok1(alloc_check(mem, POOL_SIZE));
+	ok1(alloc_size(mem, pool_size, p[0]) >= max_size);
+	ok1(alloc_check(mem, pool_size));
+	alloc_free(mem, pool_size, p[0]);
+	ok1(alloc_check(mem, pool_size));
 
 	/* Alignment constraints should be met, as long as powers of two */
-	for (i = 0; i < POOL_ORD-1; i++) {
-		p[i] = alloc_get(mem, POOL_SIZE, i, 1 << i);
+	for (i = 0; (1 << i) < alloc_limit; i++) {
+		p[i] = alloc_get(mem, pool_size, i, 1 << i);
 		ok1(p[i]);
-		ok1(((unsigned long)p[i] % (1 << i)) == 0);
-		ok1(alloc_check(mem, POOL_SIZE));
-		ok1(alloc_size(mem, POOL_SIZE, p[i]) >= i);
+		ok1(((char *)p[i] - (char *)mem) % (1 << i) == 0);
+		ok1(alloc_check(mem, pool_size));
+		ok1(alloc_size(mem, pool_size, p[i]) >= i);
 	}
 
-	for (i = 0; i < POOL_ORD-1; i++) {
-		alloc_free(mem, POOL_SIZE, p[i]);
-		ok1(alloc_check(mem, POOL_SIZE));
+	for (i = 0; (1 << i) < alloc_limit; i++) {
+		alloc_free(mem, pool_size, p[i]);
+		ok1(alloc_check(mem, pool_size));
 	}
 
 	/* Alignment constraints for a single-byte allocation. */
-	for (i = 0; i < POOL_ORD; i++) {
-		p[0] = alloc_get(mem, POOL_SIZE, 1, 1 << i);
+	for (i = 0; (1 << i) < alloc_limit; i++) {
+		p[0] = alloc_get(mem, pool_size, 1, 1 << i);
 		ok1(p[0]);
-		ok1(alloc_check(mem, POOL_SIZE));
-		ok1(alloc_size(mem, POOL_SIZE, p[i]) >= 1);
-		alloc_free(mem, POOL_SIZE, p[0]);
-		ok1(alloc_check(mem, POOL_SIZE));
+		ok1(((char *)p[0] - (char *)mem) % (1 << i) == 0);
+		ok1(alloc_check(mem, pool_size));
+		ok1(alloc_size(mem, pool_size, p[0]) >= 1);
+		alloc_free(mem, pool_size, p[0]);
+		ok1(alloc_check(mem, pool_size));
 	}
 
 	/* Alignment check for a 0-byte allocation.  Corner case. */
-	p[0] = alloc_get(mem, POOL_SIZE, 0, 1 << (POOL_ORD - 1));
-	ok1(alloc_check(mem, POOL_SIZE));
-	ok1(alloc_size(mem, POOL_SIZE, p[0]) < POOL_SIZE);
-	alloc_free(mem, POOL_SIZE, p[0]);
-	ok1(alloc_check(mem, POOL_SIZE));
-
-	/* Force the testing of split metadata. */
-	alloc_init(mem, POOL_SIZE);
-	for (i = 0; i < POOL_SIZE; i++) {
-		p[i] = alloc_get(mem, POOL_SIZE, getpagesize(), getpagesize());
-		if (!p[i])
-			break;
-	}
-	ok1(alloc_check(mem, POOL_SIZE));
-	ok1(alloc_size(mem, POOL_SIZE, p[i-1]) >= getpagesize());
-
-	/* Sort them. */
-	sort(p, i-1, addr_cmp);
-
-	/* Free all but the one next to the metadata. */
-	for (i = 1; p[i]; i++)
-		alloc_free(mem, POOL_SIZE, p[i]);
-	ok1(alloc_check(mem, POOL_SIZE));
-	ok1(alloc_size(mem, POOL_SIZE, p[0]) >= getpagesize());
+	p[0] = alloc_get(mem, pool_size, 0, alloc_limit);
+	ok1(alloc_check(mem, pool_size));
+	ok1(alloc_size(mem, pool_size, p[0]) < pool_size);
+	alloc_free(mem, pool_size, p[0]);
+	ok1(alloc_check(mem, pool_size));
+}
 
-	/* Now do a whole heap of subpage allocs. */
-	for (i = 1; i < POOL_SIZE; i++) {
-		p[i] = alloc_get(mem, POOL_SIZE, 1, 1);
-		if (!p[i])
-			break;
-	}
-	ok1(alloc_check(mem, POOL_SIZE));
+int main(int argc, char *argv[])
+{
+	plan_tests(440);
 
-	/* Free up our page next to metadata, and should be able to alloc */
-	alloc_free(mem, POOL_SIZE, p[0]);
-	ok1(alloc_check(mem, POOL_SIZE));
-	p[0] = alloc_get(mem, POOL_SIZE, 1, 1);
-	ok1(p[0]);
-	ok1(alloc_size(mem, POOL_SIZE, p[0]) >= 1);
+	/* Large test. */
+	test(MIN_USEFUL_SIZE * 2);
 
-	/* Clean up. */
-	for (i = 0; p[i]; i++)
-		alloc_free(mem, POOL_SIZE, p[i]);
-	ok1(alloc_check(mem, POOL_SIZE));
+	/* Small test. */
+	test(MIN_USEFUL_SIZE / 2);
 
 	return exit_status();
 }