From ab2fbfa238f73f403cac851f8de701f9fee21969 Mon Sep 17 00:00:00 2001 From: Rich Prohaska Date: Thu, 29 Nov 2007 18:03:21 +0000 Subject: [PATCH] addresses #8 git-svn-id: file:///svn/tokudb@828 c7de825b-a66e-492c-adef-691d508d4ae1 --- newbrt/brt-test.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/newbrt/brt-test.c b/newbrt/brt-test.c index 5bb8e043bf8..66033c2b128 100644 --- a/newbrt/brt-test.c +++ b/newbrt/brt-test.c @@ -92,7 +92,7 @@ static void test2 (int memcheck) { if (0) { brt_flush(t); { - int n = get_n_items_malloced(); + int n = toku_get_n_items_malloced(); printf("%s:%d i=%d n_items_malloced=%d\n", __FILE__, __LINE__, i, n); if (n!=3) toku_print_malloced_items(); assert(n==3); @@ -622,26 +622,26 @@ void test_cursor_last_empty(void) { printf("%s", __FUNCTION__); unlink(n); toku_memory_check_all_free(); - //printf("%s:%d %d alloced\n", __FILE__, __LINE__, get_n_items_malloced()); toku_print_malloced_items(); + //printf("%s:%d %d alloced\n", __FILE__, __LINE__, toku_get_n_items_malloced()); toku_print_malloced_items(); r = toku_brt_create_cachetable(&ct, 0, ZERO_LSN, NULL_LOGGER); assert(r==0); - //printf("%s:%d %d alloced\n", __FILE__, __LINE__, get_n_items_malloced()); toku_print_malloced_items(); + //printf("%s:%d %d alloced\n", __FILE__, __LINE__, toku_get_n_items_malloced()); toku_print_malloced_items(); r = toku_open_brt(n, 0, 1, &brt, 1<<12, ct, null_txn, toku_default_compare_fun, null_db); assert(r==0); - //printf("%s:%d %d alloced\n", __FILE__, __LINE__, get_n_items_malloced()); toku_print_malloced_items(); + //printf("%s:%d %d alloced\n", __FILE__, __LINE__, toku_get_n_items_malloced()); toku_print_malloced_items(); r = toku_brt_cursor(brt, &cursor); assert(r==0); toku_init_dbt(&kbt); - //printf("%s:%d %d alloced\n", __FILE__, __LINE__, get_n_items_malloced()); toku_print_malloced_items(); + //printf("%s:%d %d alloced\n", __FILE__, __LINE__, toku_get_n_items_malloced()); toku_print_malloced_items(); toku_init_dbt(&vbt); - //printf("%s:%d %d alloced\n", __FILE__, __LINE__, get_n_items_malloced()); toku_print_malloced_items(); + //printf("%s:%d %d alloced\n", __FILE__, __LINE__, toku_get_n_items_malloced()); toku_print_malloced_items(); r = toku_brt_cursor_get(cursor, &kbt, &vbt, DB_LAST, null_txn); - //printf("%s:%d %d alloced\n", __FILE__, __LINE__, get_n_items_malloced()); toku_print_malloced_items(); + //printf("%s:%d %d alloced\n", __FILE__, __LINE__, toku_get_n_items_malloced()); toku_print_malloced_items(); assert(r==DB_NOTFOUND); r = toku_brt_cursor_get(cursor, &kbt, &vbt, DB_FIRST, null_txn); - //printf("%s:%d %d alloced\n", __FILE__, __LINE__, get_n_items_malloced()); toku_print_malloced_items(); + //printf("%s:%d %d alloced\n", __FILE__, __LINE__, toku_get_n_items_malloced()); toku_print_malloced_items(); assert(r==DB_NOTFOUND); r = toku_close_brt(brt); - //printf("%s:%d %d alloced\n", __FILE__, __LINE__, get_n_items_malloced()); toku_print_malloced_items(); + //printf("%s:%d %d alloced\n", __FILE__, __LINE__, toku_get_n_items_malloced()); toku_print_malloced_items(); r = toku_cachetable_close(&ct); assert(r==0); - //printf("%s:%d %d alloced\n", __FILE__, __LINE__, get_n_items_malloced()); toku_print_malloced_items(); + //printf("%s:%d %d alloced\n", __FILE__, __LINE__, toku_get_n_items_malloced()); toku_print_malloced_items(); toku_memory_check_all_free(); } @@ -656,22 +656,22 @@ void test_cursor_next (void) { unlink(n); toku_memory_check_all_free(); r = toku_brt_create_cachetable(&ct, 0, ZERO_LSN, NULL_LOGGER); assert(r==0); - //printf("%s:%d %d alloced\n", __FILE__, __LINE__, get_n_items_malloced()); toku_print_malloced_items(); + //printf("%s:%d %d alloced\n", __FILE__, __LINE__, toku_get_n_items_malloced()); toku_print_malloced_items(); r = toku_open_brt(n, 0, 1, &brt, 1<<12, ct, null_txn, toku_default_compare_fun, null_db); assert(r==0); - //printf("%s:%d %d alloced\n", __FILE__, __LINE__, get_n_items_malloced()); toku_print_malloced_items(); + //printf("%s:%d %d alloced\n", __FILE__, __LINE__, toku_get_n_items_malloced()); toku_print_malloced_items(); r = toku_brt_insert(brt, toku_fill_dbt(&kbt, "hello", 6), toku_fill_dbt(&vbt, "there", 6), null_txn); r = toku_brt_insert(brt, toku_fill_dbt(&kbt, "byebye", 7), toku_fill_dbt(&vbt, "byenow", 7), null_txn); printf("%s:%d calling toku_brt_cursor(...)\n", __FILE__, __LINE__); r = toku_brt_cursor(brt, &cursor); assert(r==0); toku_init_dbt(&kbt); - //printf("%s:%d %d alloced\n", __FILE__, __LINE__, get_n_items_malloced()); toku_print_malloced_items(); + //printf("%s:%d %d alloced\n", __FILE__, __LINE__, toku_get_n_items_malloced()); toku_print_malloced_items(); toku_init_dbt(&vbt); - //printf("%s:%d %d alloced\n", __FILE__, __LINE__, get_n_items_malloced()); toku_print_malloced_items(); + //printf("%s:%d %d alloced\n", __FILE__, __LINE__, toku_get_n_items_malloced()); toku_print_malloced_items(); printf("%s:%d calling toku_brt_cursor_get(...)\n", __FILE__, __LINE__); r = toku_brt_cursor_get(cursor, &kbt, &vbt, DB_NEXT, null_txn); printf("%s:%d called toku_brt_cursor_get(...)\n", __FILE__, __LINE__); - //printf("%s:%d %d alloced\n", __FILE__, __LINE__, get_n_items_malloced()); toku_print_malloced_items(); + //printf("%s:%d %d alloced\n", __FILE__, __LINE__, toku_get_n_items_malloced()); toku_print_malloced_items(); assert(r==0); assert(kbt.size==7); assert(memcmp(kbt.data, "byebye", 7)==0); @@ -689,9 +689,9 @@ void test_cursor_next (void) { assert(r==DB_NOTFOUND); r = toku_close_brt(brt); - //printf("%s:%d %d alloced\n", __FILE__, __LINE__, get_n_items_malloced()); toku_print_malloced_items(); + //printf("%s:%d %d alloced\n", __FILE__, __LINE__, toku_get_n_items_malloced()); toku_print_malloced_items(); r = toku_cachetable_close(&ct); assert(r==0); - //printf("%s:%d %d alloced\n", __FILE__, __LINE__, get_n_items_malloced()); toku_print_malloced_items(); + //printf("%s:%d %d alloced\n", __FILE__, __LINE__, toku_get_n_items_malloced()); toku_print_malloced_items(); toku_memory_check_all_free(); }