From facfe8867d0f69f194d375a81f54dcb4eb91334e Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 28 Sep 2004 23:30:14 +0000 Subject: r2742: - fixed a bug in talloc_unreference() - made the LOCAL-TALLOC smbtorture test much stricter, checking that block counts for every pointer are correct after every operation (This used to be commit 18d3e2647f0bedbba699d1ba2649c0cfe4526ef6) --- source4/torture/local/talloc.c | 154 ++++++++++++++++++++++++++++++----------- 1 file changed, 113 insertions(+), 41 deletions(-) (limited to 'source4/torture') diff --git a/source4/torture/local/talloc.c b/source4/torture/local/talloc.c index 9f518eabf2..e046ae8dc5 100644 --- a/source4/torture/local/talloc.c +++ b/source4/torture/local/talloc.c @@ -22,42 +22,68 @@ #include "includes.h" +#define CHECK_BLOCKS(ptr, tblocks) do { \ + if (talloc_total_blocks(ptr) != (tblocks)) { \ + printf("(%d) failed: wrong '%s' tree size: got %u expected %u\n", \ + __LINE__, #ptr, \ + (unsigned)talloc_total_blocks(ptr), \ + (unsigned)tblocks); \ + talloc_report_full(ptr, stdout); \ + return False; \ + } \ +} while (0) + /* test references */ static BOOL test_ref1(void) { - void *p1, *p2, *ref, *r1; + void *root, *p1, *p2, *ref, *r1; printf("TESTING SINGLE REFERENCE FREE\n"); - p1 = talloc_named_const(NULL, 1, "p1"); + root = talloc_named_const(NULL, 0, "root"); + p1 = talloc_named_const(root, 1, "p1"); p2 = talloc_named_const(p1, 1, "p2"); talloc_named_const(p1, 1, "x1"); - talloc_named_const(p1, 1, "x2"); - talloc_named_const(p1, 1, "x3"); + talloc_named_const(p1, 2, "x2"); + talloc_named_const(p1, 3, "x3"); - r1 = talloc_named_const(NULL, 1, "r1"); + r1 = talloc_named_const(root, 1, "r1"); ref = talloc_reference(r1, p2); - talloc_report_full(NULL, stdout); + talloc_report_full(root, stdout); + + CHECK_BLOCKS(p1, 5); + CHECK_BLOCKS(p2, 1); + CHECK_BLOCKS(r1, 2); printf("Freeing p2\n"); talloc_free(p2); - talloc_report_full(NULL, stdout); + talloc_report_full(root, stdout); + + CHECK_BLOCKS(p1, 5); + CHECK_BLOCKS(p2, 1); + CHECK_BLOCKS(r1, 1); printf("Freeing p1\n"); talloc_free(p1); - talloc_report_full(NULL, stdout); + talloc_report_full(root, stdout); + + CHECK_BLOCKS(r1, 1); printf("Freeing r1\n"); talloc_free(r1); talloc_report_full(NULL, stdout); - if (talloc_total_size(NULL) != 0) { + CHECK_BLOCKS(root, 1); + + if (talloc_total_size(root) != 0) { printf("failed: non-zero total size\n"); return False; } + talloc_free(root); + return True; } @@ -66,41 +92,57 @@ static BOOL test_ref1(void) */ static BOOL test_ref2(void) { - void *p1, *p2, *ref, *r1; + void *root, *p1, *p2, *ref, *r1; printf("TESTING DOUBLE REFERENCE FREE\n"); - p1 = talloc_named_const(NULL, 1, "p1"); + root = talloc_named_const(NULL, 0, "root"); + p1 = talloc_named_const(root, 1, "p1"); talloc_named_const(p1, 1, "x1"); talloc_named_const(p1, 1, "x2"); talloc_named_const(p1, 1, "x3"); p2 = talloc_named_const(p1, 1, "p2"); - r1 = talloc_named_const(NULL, 1, "r1"); + r1 = talloc_named_const(root, 1, "r1"); ref = talloc_reference(r1, p2); - talloc_report_full(NULL, stdout); + talloc_report_full(root, stdout); + + CHECK_BLOCKS(p1, 5); + CHECK_BLOCKS(p2, 1); + CHECK_BLOCKS(r1, 2); printf("Freeing ref\n"); talloc_free(ref); - talloc_report_full(NULL, stdout); + talloc_report_full(root, stdout); + + CHECK_BLOCKS(p1, 5); + CHECK_BLOCKS(p2, 1); + CHECK_BLOCKS(r1, 1); printf("Freeing p2\n"); talloc_free(p2); - talloc_report_full(NULL, stdout); + talloc_report_full(root, stdout); + + CHECK_BLOCKS(p1, 4); + CHECK_BLOCKS(r1, 1); printf("Freeing p1\n"); talloc_free(p1); - talloc_report_full(NULL, stdout); + talloc_report_full(root, stdout); + + CHECK_BLOCKS(r1, 1); printf("Freeing r1\n"); talloc_free(r1); - talloc_report_full(NULL, stdout); + talloc_report_full(root, stdout); - if (talloc_total_size(NULL) != 0) { + if (talloc_total_size(root) != 0) { printf("failed: non-zero total size\n"); return False; } + talloc_free(root); + return True; } @@ -109,32 +151,39 @@ static BOOL test_ref2(void) */ static BOOL test_ref3(void) { - void *p1, *p2, *ref, *r1; + void *root, *p1, *p2, *ref, *r1; printf("TESTING PARENT REFERENCE FREE\n"); - p1 = talloc_named_const(NULL, 1, "p1"); - p2 = talloc_named_const(NULL, 1, "p2"); - + root = talloc_named_const(NULL, 0, "root"); + p1 = talloc_named_const(root, 1, "p1"); + p2 = talloc_named_const(root, 1, "p2"); r1 = talloc_named_const(p1, 1, "r1"); - ref = talloc_reference(p2, r1); + talloc_report_full(root, stdout); - talloc_report_full(NULL, stdout); + CHECK_BLOCKS(p1, 2); + CHECK_BLOCKS(p2, 2); + CHECK_BLOCKS(r1, 1); printf("Freeing p1\n"); talloc_free(p1); - talloc_report_full(NULL, stdout); + talloc_report_full(root, stdout); + + CHECK_BLOCKS(p2, 2); + CHECK_BLOCKS(r1, 1); printf("Freeing p2\n"); talloc_free(p2); - talloc_report_full(NULL, stdout); + talloc_report_full(root, stdout); - if (talloc_total_size(NULL) != 0) { + if (talloc_total_size(root) != 0) { printf("failed: non-zero total size\n"); return False; } + talloc_free(root); + return True; } @@ -143,37 +192,49 @@ static BOOL test_ref3(void) */ static BOOL test_ref4(void) { - void *p1, *p2, *ref, *r1; + void *root, *p1, *p2, *ref, *r1; printf("TESTING REFERRER REFERENCE FREE\n"); - p1 = talloc_named_const(NULL, 1, "p1"); + root = talloc_named_const(NULL, 0, "root"); + p1 = talloc_named_const(root, 1, "p1"); talloc_named_const(p1, 1, "x1"); talloc_named_const(p1, 1, "x2"); talloc_named_const(p1, 1, "x3"); p2 = talloc_named_const(p1, 1, "p2"); - r1 = talloc_named_const(NULL, 1, "r1"); + r1 = talloc_named_const(root, 1, "r1"); ref = talloc_reference(r1, p2); - talloc_report_full(NULL, stdout); + talloc_report_full(root, stdout); + + CHECK_BLOCKS(p1, 5); + CHECK_BLOCKS(p2, 1); + CHECK_BLOCKS(r1, 2); printf("Freeing r1\n"); talloc_free(r1); - talloc_report_full(NULL, stdout); + talloc_report_full(root, stdout); + + CHECK_BLOCKS(p1, 5); + CHECK_BLOCKS(p2, 1); printf("Freeing p2\n"); talloc_free(p2); - talloc_report_full(NULL, stdout); + talloc_report_full(root, stdout); + + CHECK_BLOCKS(p1, 4); printf("Freeing p1\n"); talloc_free(p1); - talloc_report_full(NULL, stdout); + talloc_report_full(root, stdout); - if (talloc_total_size(NULL) != 0) { + if (talloc_total_size(root) != 0) { printf("failed: non-zero total size\n"); return False; } + talloc_free(root); + return True; } @@ -183,11 +244,12 @@ static BOOL test_ref4(void) */ static BOOL test_unref1(void) { - void *p1, *p2, *ref, *r1; + void *root, *p1, *p2, *ref, *r1; printf("TESTING UNREFERENCE\n"); - p1 = talloc_named_const(NULL, 1, "p1"); + root = talloc_named_const(NULL, 0, "root"); + p1 = talloc_named_const(root, 1, "p1"); talloc_named_const(p1, 1, "x1"); talloc_named_const(p1, 1, "x2"); talloc_named_const(p1, 1, "x3"); @@ -195,21 +257,31 @@ static BOOL test_unref1(void) r1 = talloc_named_const(p1, 1, "r1"); ref = talloc_reference(r1, p2); - talloc_report_full(NULL, stdout); + talloc_report_full(root, stdout); + + CHECK_BLOCKS(p1, 7); + CHECK_BLOCKS(p2, 1); + CHECK_BLOCKS(r1, 2); printf("Unreferencing r1\n"); talloc_unreference(r1, p2); - talloc_report_full(NULL, stdout); + talloc_report_full(root, stdout); + + CHECK_BLOCKS(p1, 6); + CHECK_BLOCKS(p2, 1); + CHECK_BLOCKS(r1, 1); printf("Freeing p1\n"); talloc_free(p1); - talloc_report_full(NULL, stdout); + talloc_report_full(root, stdout); - if (talloc_total_size(NULL) != 0) { + if (talloc_total_size(root) != 0) { printf("failed: non-zero total size\n"); return False; } + talloc_free(root); + return True; } -- cgit