From 2c412190e7549a221d000fa18987bb50223df293 Mon Sep 17 00:00:00 2001 From: "Bradley C. Kuszmaul" Date: Tue, 16 Apr 2013 23:57:20 -0400 Subject: [PATCH] Get rid of most CIL warnings. Addresses #1185. git-svn-id: file:///svn/tokudb.1131b+1080a+1185@6456 c7de825b-a66e-492c-adef-691d508d4ae1 --- newbrt/brt-test-helpers.c | 3 +- newbrt/cachetable-rwlock.h | 8 +- newbrt/tdb_logprint.c | 3 + newbrt/tests/Makefile | 4 + newbrt/tests/brt-serialize-test.c | 10 +- newbrt/tests/brt-test-cursor-2.c | 15 +-- newbrt/tests/brt-test-cursor.c | 15 +-- newbrt/tests/brt-test.c | 15 +-- newbrt/tests/brt-test3.c | 15 +-- newbrt/tests/brt-test4.c | 15 +-- newbrt/tests/cachetable-count-pinned-test.c | 6 +- newbrt/tests/cachetable-debug-test.c | 6 +- newbrt/tests/cachetable-fd-test.c | 7 +- newbrt/tests/cachetable-flush-test.c | 6 +- newbrt/tests/cachetable-getandpin-test.c | 6 +- newbrt/tests/cachetable-put-test.c | 6 +- newbrt/tests/cachetable-rename-test.c | 13 +-- newbrt/tests/cachetable-rwlock-test.c | 10 +- newbrt/tests/cachetable-scan.c | 9 +- newbrt/tests/cachetable-test.c | 14 +-- newbrt/tests/cachetable-test2.c | 12 +-- newbrt/tests/cachetable-unpin-test.c | 6 +- newbrt/tests/cachetable-writequeue-test.c | 8 +- newbrt/tests/omt-cursor-test.c | 31 +++--- newbrt/tests/omt-test.c | 106 +++++++++----------- newbrt/tests/test-del-inorder.c | 11 +- newbrt/tests/test-inc-split.c | 11 +- 27 files changed, 99 insertions(+), 272 deletions(-) diff --git a/newbrt/brt-test-helpers.c b/newbrt/brt-test-helpers.c index 86260e96fe2..93d40d5836f 100644 --- a/newbrt/brt-test-helpers.c +++ b/newbrt/brt-test-helpers.c @@ -1,5 +1,4 @@ -#include "brt-internal.h" -#include "toku_assert.h" +#include "includes.h" int toku_testsetup_leaf(BRT brt, BLOCKNUM *blocknum) { BRTNODE node; diff --git a/newbrt/cachetable-rwlock.h b/newbrt/cachetable-rwlock.h index de0e58acd9a..fd21406fb87 100644 --- a/newbrt/cachetable-rwlock.h +++ b/newbrt/cachetable-rwlock.h @@ -24,7 +24,9 @@ struct ctpair_rwlock { // initialize a read write lock -static void ctpair_rwlock_init(CTPAIR_RWLOCK rwlock) { +static __attribute__((__unused__)) +void +ctpair_rwlock_init(CTPAIR_RWLOCK rwlock) { int r; rwlock->pinned = rwlock->want_pin = 0; r = pthread_cond_init(&rwlock->wait_pin, 0); assert(r == 0); @@ -34,7 +36,9 @@ static void ctpair_rwlock_init(CTPAIR_RWLOCK rwlock) { // destroy a read write lock -static void ctpair_rwlock_destroy(CTPAIR_RWLOCK rwlock) { +static __attribute__((__unused__)) +void +ctpair_rwlock_destroy(CTPAIR_RWLOCK rwlock) { int r; assert(rwlock->pinned == 0 && rwlock->want_pin == 0); assert(rwlock->writer == 0 && rwlock->want_write == 0); diff --git a/newbrt/tdb_logprint.c b/newbrt/tdb_logprint.c index 35b8089e85a..6516c08e4d0 100644 --- a/newbrt/tdb_logprint.c +++ b/newbrt/tdb_logprint.c @@ -2,6 +2,9 @@ #ident "Copyright (c) 2007, 2008 Tokutek Inc. All rights reserved." /* Dump the log from stdin to stdout. */ + +#include "includes.h" + #include "brttypes.h" #include "log-internal.h" #include "log_header.h" diff --git a/newbrt/tests/Makefile b/newbrt/tests/Makefile index bec13438d14..cfa9f73614d 100644 --- a/newbrt/tests/Makefile +++ b/newbrt/tests/Makefile @@ -126,6 +126,10 @@ CHECKS = \ $(REGRESSION_TESTS) \ # This line intentially kept commented so I can have a \ on the previous line +ifeq ($(CIL),1) + CC=../../../cil/cil-1.3.6/bin/cilly --merge --keepmerged +endif + build: $(BINS) foo: echo $(BINS) diff --git a/newbrt/tests/brt-serialize-test.c b/newbrt/tests/brt-serialize-test.c index 1618d40f521..0c781b2ed4f 100644 --- a/newbrt/tests/brt-serialize-test.c +++ b/newbrt/tests/brt-serialize-test.c @@ -1,15 +1,7 @@ /* -*- mode: C; c-basic-offset: 4 -*- */ #ident "Copyright (c) 2007, 2008 Tokutek Inc. All rights reserved." -#include "toku_assert.h" -#include "brt-internal.h" -#include "kv-pair.h" - -#include -#include -#include -#include -#include +#include "includes.h" static void test_serialize(void) { // struct brt source_brt; diff --git a/newbrt/tests/brt-test-cursor-2.c b/newbrt/tests/brt-test-cursor-2.c index 5393efe8b34..82a1d74ca34 100644 --- a/newbrt/tests/brt-test-cursor-2.c +++ b/newbrt/tests/brt-test-cursor-2.c @@ -1,20 +1,7 @@ /* -*- mode: C; c-basic-offset: 4 -*- */ #ident "Copyright (c) 2007, 2008 Tokutek Inc. All rights reserved." -#include "brt.h" -#include "key.h" -#include "brt-internal.h" -#include "memory.h" -#include "toku_assert.h" - -#include -#include -#include -#include -#include -#include -#include - +#include "includes.h" #include "test.h" static const char fname[]= __FILE__ ".brt"; diff --git a/newbrt/tests/brt-test-cursor.c b/newbrt/tests/brt-test-cursor.c index 3288a97e38e..6bb2e1e4fc6 100644 --- a/newbrt/tests/brt-test-cursor.c +++ b/newbrt/tests/brt-test-cursor.c @@ -1,20 +1,7 @@ /* -*- mode: C; c-basic-offset: 4 -*- */ #ident "Copyright (c) 2007, 2008 Tokutek Inc. All rights reserved." -#include "brt.h" -#include "key.h" -#include "brt-internal.h" -#include "memory.h" -#include "toku_assert.h" - -#include -#include -#include -#include -#include -#include -#include - +#include "includes.h" #include "test.h" static const char fname[]= __FILE__ ".brt"; diff --git a/newbrt/tests/brt-test.c b/newbrt/tests/brt-test.c index 936011c0903..7edd0970b8f 100644 --- a/newbrt/tests/brt-test.c +++ b/newbrt/tests/brt-test.c @@ -1,20 +1,7 @@ /* -*- mode: C; c-basic-offset: 4 -*- */ #ident "Copyright (c) 2007, 2008 Tokutek Inc. All rights reserved." -#include "brt.h" -#include "key.h" -#include "brt-internal.h" -#include "memory.h" -#include "toku_assert.h" - -#include -#include -#include -#include -#include -#include -#include - +#include "includes.h" #include "test.h" static TOKUTXN const null_txn = 0; diff --git a/newbrt/tests/brt-test3.c b/newbrt/tests/brt-test3.c index 6e6812f72c7..f76da3e280e 100644 --- a/newbrt/tests/brt-test3.c +++ b/newbrt/tests/brt-test3.c @@ -1,20 +1,7 @@ /* -*- mode: C; c-basic-offset: 4 -*- */ #ident "Copyright (c) 2007, 2008 Tokutek Inc. All rights reserved." -#include "brt.h" -#include "key.h" -#include "brt-internal.h" -#include "memory.h" -#include "toku_assert.h" - -#include -#include -#include -#include -#include -#include -#include - +#include "includes.h" #include "test.h" static const char fname[]= __FILE__ ".brt"; diff --git a/newbrt/tests/brt-test4.c b/newbrt/tests/brt-test4.c index 0f9bb664464..6602894a1ac 100644 --- a/newbrt/tests/brt-test4.c +++ b/newbrt/tests/brt-test4.c @@ -1,20 +1,7 @@ /* -*- mode: C; c-basic-offset: 4 -*- */ #ident "Copyright (c) 2007, 2008 Tokutek Inc. All rights reserved." -#include "brt.h" -#include "key.h" -#include "brt-internal.h" -#include "memory.h" -#include "toku_assert.h" - -#include -#include -#include -#include -#include -#include -#include - +#include "includes.h" #include "test.h" static const char fname[]= __FILE__ ".brt"; diff --git a/newbrt/tests/cachetable-count-pinned-test.c b/newbrt/tests/cachetable-count-pinned-test.c index 3e0e494fb47..336f8775347 100644 --- a/newbrt/tests/cachetable-count-pinned-test.c +++ b/newbrt/tests/cachetable-count-pinned-test.c @@ -1,9 +1,5 @@ -#include -#include -#include - +#include "includes.h" #include "test.h" -#include "cachetable.h" static void flush (CACHEFILE f __attribute__((__unused__)), diff --git a/newbrt/tests/cachetable-debug-test.c b/newbrt/tests/cachetable-debug-test.c index f9fd68843de..b37aacb7734 100644 --- a/newbrt/tests/cachetable-debug-test.c +++ b/newbrt/tests/cachetable-debug-test.c @@ -1,9 +1,5 @@ -#include -#include -#include - +#include "includes.h" #include "test.h" -#include "cachetable.h" static void flush (CACHEFILE f __attribute__((__unused__)), diff --git a/newbrt/tests/cachetable-fd-test.c b/newbrt/tests/cachetable-fd-test.c index 5e1ef7f7568..804295c1457 100644 --- a/newbrt/tests/cachetable-fd-test.c +++ b/newbrt/tests/cachetable-fd-test.c @@ -1,10 +1,5 @@ -#include -#include -#include -#include - +#include "includes.h" #include "test.h" -#include "cachetable.h" static void cachetable_fd_test (void) { diff --git a/newbrt/tests/cachetable-flush-test.c b/newbrt/tests/cachetable-flush-test.c index abd802400a9..e39267806b6 100644 --- a/newbrt/tests/cachetable-flush-test.c +++ b/newbrt/tests/cachetable-flush-test.c @@ -1,9 +1,5 @@ -#include -#include -#include - +#include "includes.h" #include "test.h" -#include "cachetable.h" static void flush (CACHEFILE f __attribute__((__unused__)), diff --git a/newbrt/tests/cachetable-getandpin-test.c b/newbrt/tests/cachetable-getandpin-test.c index ce2f4693b60..8b3e3017546 100644 --- a/newbrt/tests/cachetable-getandpin-test.c +++ b/newbrt/tests/cachetable-getandpin-test.c @@ -1,9 +1,5 @@ -#include -#include -#include - +#include "includes.h" #include "test.h" -#include "cachetable.h" static void flush (CACHEFILE cf __attribute__((__unused__)), diff --git a/newbrt/tests/cachetable-put-test.c b/newbrt/tests/cachetable-put-test.c index b960d79060b..d2a0e22fa7f 100644 --- a/newbrt/tests/cachetable-put-test.c +++ b/newbrt/tests/cachetable-put-test.c @@ -1,9 +1,5 @@ -#include -#include -#include - +#include "includes.h" #include "test.h" -#include "cachetable.h" static void flush (CACHEFILE f __attribute__((__unused__)), diff --git a/newbrt/tests/cachetable-rename-test.c b/newbrt/tests/cachetable-rename-test.c index c30f286e27c..b404aae8851 100644 --- a/newbrt/tests/cachetable-rename-test.c +++ b/newbrt/tests/cachetable-rename-test.c @@ -1,18 +1,7 @@ /* -*- mode: C; c-basic-offset: 4 -*- */ #ident "Copyright (c) 2007, 2008 Tokutek Inc. All rights reserved." -#include -#include -#include -#include -#include -#include -#include -#include - -#include "toku_assert.h" -#include "memory.h" -#include "cachetable.h" +#include "includes.h" #include "test.h" // this mutex is used by some of the tests to serialize access to some diff --git a/newbrt/tests/cachetable-rwlock-test.c b/newbrt/tests/cachetable-rwlock-test.c index 923b53c9743..6dd58c6bf3a 100644 --- a/newbrt/tests/cachetable-rwlock-test.c +++ b/newbrt/tests/cachetable-rwlock-test.c @@ -1,12 +1,4 @@ -#include -#include -#include -#include -#include -#include -#include - -#include "cachetable-rwlock.h" +#include "includes.h" int verbose = 0; diff --git a/newbrt/tests/cachetable-scan.c b/newbrt/tests/cachetable-scan.c index 41fdc0b46f3..dfe7155f138 100644 --- a/newbrt/tests/cachetable-scan.c +++ b/newbrt/tests/cachetable-scan.c @@ -1,14 +1,7 @@ /* How fast can we read a file usng the cachetable interface. */ #ident "Copyright (c) 2007, 2008 Tokutek Inc. All rights reserved." -#include -#include -#include -#include -#include -#include - -#include "cachetable.h" +#include "includes.h" enum { KEYLIMIT = 4, BLOCKSIZE=1<<20, N=2048}; diff --git a/newbrt/tests/cachetable-test.c b/newbrt/tests/cachetable-test.c index ebb3a25eef7..dc40f551c31 100644 --- a/newbrt/tests/cachetable-test.c +++ b/newbrt/tests/cachetable-test.c @@ -1,19 +1,7 @@ /* -*- mode: C; c-basic-offset: 4 -*- */ #ident "Copyright (c) 2007, 2008 Tokutek Inc. All rights reserved." -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "toku_assert.h" -#include "memory.h" -#include "cachetable.h" +#include "includes.h" #include "test.h" #if 0 diff --git a/newbrt/tests/cachetable-test2.c b/newbrt/tests/cachetable-test2.c index c0252d087b1..773fe1c8698 100644 --- a/newbrt/tests/cachetable-test2.c +++ b/newbrt/tests/cachetable-test2.c @@ -1,17 +1,7 @@ /* -*- mode: C; c-basic-offset: 4 -*- */ #ident "Copyright (c) 2007, 2008 Tokutek Inc. All rights reserved." -#include -#include -#include -#include -#include -#include - -#include "memory.h" -#include "cachetable.h" -#include "toku_assert.h" - +#include "includes.h" #include "test.h" // this mutex is used by some of the tests to serialize access to some diff --git a/newbrt/tests/cachetable-unpin-test.c b/newbrt/tests/cachetable-unpin-test.c index 864f2acd491..45ad98a35cc 100644 --- a/newbrt/tests/cachetable-unpin-test.c +++ b/newbrt/tests/cachetable-unpin-test.c @@ -1,9 +1,5 @@ -#include -#include -#include - +#include "includes.h" #include "test.h" -#include "cachetable.h" static void flush (CACHEFILE f __attribute__((__unused__)), diff --git a/newbrt/tests/cachetable-writequeue-test.c b/newbrt/tests/cachetable-writequeue-test.c index 4c9e5b096cb..fd350288d69 100644 --- a/newbrt/tests/cachetable-writequeue-test.c +++ b/newbrt/tests/cachetable-writequeue-test.c @@ -1,10 +1,4 @@ -#include -#include -#include -#include -#include -#include -#include +#include "includes.h" int verbose; diff --git a/newbrt/tests/omt-cursor-test.c b/newbrt/tests/omt-cursor-test.c index 0b1c35718b3..027b27a83f8 100644 --- a/newbrt/tests/omt-cursor-test.c +++ b/newbrt/tests/omt-cursor-test.c @@ -1,12 +1,11 @@ -#include -#include -typedef struct value *OMTVALUE; -#include "omt.h" +#include "includes.h" enum { N=10 }; struct value { int x; } vs[N]; OMTVALUE ps[N]; +#define V(x) ((struct value *)(x)) + static void test (void) { OMT o; OMTCURSOR curs, curs2, curs3; @@ -28,11 +27,11 @@ static void test (void) { r = toku_omt_create_from_sorted_array(&o, ps, 10); assert(r==0); r = toku_omt_cursor_create(&curs); assert(r==0); r = toku_omt_fetch(o, 5, &v, curs); assert(r==0); - assert(v->x==5); + assert(V(v)->x==5); r = toku_omt_cursor_next(curs, &v); - assert(r==0 && v->x==6); + assert(r==0 && V(v)->x==6); r = toku_omt_cursor_prev(curs, &v); - assert(r==0 && v->x==5); + assert(r==0 && V(v)->x==5); toku_omt_cursor_destroy(&curs); toku_omt_destroy(&o); @@ -42,7 +41,7 @@ static void test (void) { r = toku_omt_fetch(o, 5, &v, curs); assert(r==0); r = toku_omt_cursor_create(&curs2); assert(r==0); r = toku_omt_fetch(o, 4, &v, curs2); assert(r==0); - r = toku_omt_cursor_next(curs, &v); assert(r==0 && v->x==6); + r = toku_omt_cursor_next(curs, &v); assert(r==0 && V(v)->x==6); toku_omt_destroy(&o); toku_omt_cursor_destroy(&curs); toku_omt_cursor_destroy(&curs2); @@ -53,10 +52,10 @@ static void test (void) { r = toku_omt_fetch(o, 5, &v, curs); assert(r==0); r = toku_omt_cursor_create(&curs2); assert(r==0); r = toku_omt_fetch(o, 4, &v, curs2); assert(r==0); - r = toku_omt_cursor_next(curs, &v); assert(r==0 && v->x==6); - r = toku_omt_cursor_prev(curs2, &v); assert(r==0 && v->x==3); + r = toku_omt_cursor_next(curs, &v); assert(r==0 && V(v)->x==6); + r = toku_omt_cursor_prev(curs2, &v); assert(r==0 && V(v)->x==3); toku_omt_cursor_destroy(&curs); - r = toku_omt_cursor_prev(curs2, &v); assert(r==0 && v->x==2); + r = toku_omt_cursor_prev(curs2, &v); assert(r==0 && V(v)->x==2); toku_omt_cursor_destroy(&curs2); toku_omt_destroy(&o); @@ -68,14 +67,14 @@ static void test (void) { r = toku_omt_fetch(o, 4, &v, curs2); assert(r==0); r = toku_omt_cursor_create(&curs3); assert(r==0); r = toku_omt_fetch(o, 9, &v, curs3); assert(r==0); - r = toku_omt_cursor_next(curs, &v); assert(r==0 && v->x==6); - r = toku_omt_cursor_prev(curs2, &v); assert(r==0 && v->x==3); + r = toku_omt_cursor_next(curs, &v); assert(r==0 && V(v)->x==6); + r = toku_omt_cursor_prev(curs2, &v); assert(r==0 && V(v)->x==3); r = toku_omt_cursor_next(curs3, &v); assert(r!=0 && !toku_omt_cursor_is_valid(curs3)); toku_omt_cursor_destroy(&curs); - r = toku_omt_cursor_prev(curs2, &v); assert(r==0 && v->x==2); - r = toku_omt_cursor_prev(curs2, &v); assert(r==0 && v->x==1); + r = toku_omt_cursor_prev(curs2, &v); assert(r==0 && V(v)->x==2); + r = toku_omt_cursor_prev(curs2, &v); assert(r==0 && V(v)->x==1); r = toku_omt_fetch(o, 1, &v, curs3); assert(r==0); - r = toku_omt_cursor_prev(curs3, &v); assert(r==0 && v->x==0); + r = toku_omt_cursor_prev(curs3, &v); assert(r==0 && V(v)->x==0); r = toku_omt_cursor_prev(curs3, &v); assert(r!=0 && !toku_omt_cursor_is_valid(curs3)); toku_omt_cursor_destroy(&curs2); toku_omt_destroy(&o); diff --git a/newbrt/tests/omt-test.c b/newbrt/tests/omt-test.c index 6fd24dd23d5..b18df574e6d 100644 --- a/newbrt/tests/omt-test.c +++ b/newbrt/tests/omt-test.c @@ -1,17 +1,9 @@ #ident "Copyright (c) 2007 Tokutek Inc. All rights reserved." -#include -#include +#include "includes.h" -typedef struct value *OMTVALUE; +//typedef struct value *OMTVALUE; typedef OMTVALUE TESTVALUE; -#include "omt.h" -#include "../newbrt/memory.h" -#include "../newbrt/toku_assert.h" -#include "../include/db.h" -#include "../newbrt/brttypes.h" -#include -#include /* Things that would go in a omt-tests.h if we split to multiple files later. */ int verbose=0; @@ -47,6 +39,7 @@ parse_args (int argc, const char *argv[]) { struct value { u_int32_t number; }; +#define V(x) ((struct value *)(x)) enum rand_type { TEST_RANDOM, @@ -150,33 +143,33 @@ init_globals (void) { } static void -test_close (enum close_when_done close) { - if (close == KEEP_WHEN_DONE) return; - assert(close == CLOSE_WHEN_DONE); +test_close (enum close_when_done do_close) { + if (do_close == KEEP_WHEN_DONE) return; + assert(do_close == CLOSE_WHEN_DONE); toku_omt_destroy(&omt); assert(omt==NULL); } static void -test_create (enum close_when_done close) { +test_create (enum close_when_done do_close) { int r; omt = NULL; r = toku_omt_create(&omt); CKERR(r); assert(omt!=NULL); - test_close(close); + test_close(do_close); } static void -test_create_size (enum close_when_done close) { +test_create_size (enum close_when_done do_close) { test_create(KEEP_WHEN_DONE); assert(toku_omt_size(omt) == 0); - test_close(close); + test_close(do_close); } static void -test_create_insert_at_almost_random (enum close_when_done close) { +test_create_insert_at_almost_random (enum close_when_done do_close) { u_int32_t i; int r; u_int32_t size = 0; @@ -200,11 +193,11 @@ test_create_insert_at_almost_random (enum close_when_done close) { r = toku_omt_insert_at(omt, values[0], toku_omt_size(omt)+2); CKERR2(r, EINVAL); assert(size==toku_omt_size(omt)); - test_close(close); + test_close(do_close); } static void -test_create_insert_at_sequential (enum close_when_done close) { +test_create_insert_at_sequential (enum close_when_done do_close) { u_int32_t i; int r; u_int32_t size = 0; @@ -225,11 +218,11 @@ test_create_insert_at_sequential (enum close_when_done close) { r = toku_omt_insert_at(omt, values[0], toku_omt_size(omt)+2); CKERR2(r, EINVAL); assert(size==toku_omt_size(omt)); - test_close(close); + test_close(do_close); } static void -test_create_from_sorted_array (enum create_type create_choice, enum close_when_done close) { +test_create_from_sorted_array (enum create_type create_choice, enum close_when_done do_close) { int r; omt = NULL; @@ -246,14 +239,14 @@ test_create_from_sorted_array (enum create_type create_choice, enum close_when_d else assert(FALSE); assert(omt!=NULL); - test_close(close); + test_close(do_close); } static void -test_create_from_sorted_array_size (enum create_type create_choice, enum close_when_done close) { +test_create_from_sorted_array_size (enum create_type create_choice, enum close_when_done do_close) { test_create_from_sorted_array(create_choice, KEEP_WHEN_DONE); assert(toku_omt_size(omt)==length); - test_close(close); + test_close(do_close); } static void @@ -277,15 +270,14 @@ test_fetch_verify (OMT omtree, TESTVALUE* val, u_int32_t len ) { assert(v != NULL); assert(v != oldv); assert(v == val[i]); - assert(v->number == val[i]->number); - + assert(V(v)->number == V(val[i])->number); v = oldv; r = toku_omt_fetch(omtree, i, &v, c); CKERR(r); assert(v != NULL); assert(v != oldv); assert(v == val[i]); - assert(v->number == val[i]->number); + assert(V(v)->number == V(val[i])->number); assert(toku_omt_cursor_is_valid(c)); v = oldv; @@ -294,7 +286,7 @@ test_fetch_verify (OMT omtree, TESTVALUE* val, u_int32_t len ) { assert(v != NULL); assert(v != oldv); assert(v == val[i]); - assert(v->number == val[i]->number); + assert(V(v)->number == V(val[i])->number); assert(toku_omt_cursor_is_valid(c)); v = oldv; @@ -304,7 +296,7 @@ test_fetch_verify (OMT omtree, TESTVALUE* val, u_int32_t len ) { assert(v != NULL); assert(v != oldv); assert(v == val[j]); - assert(v->number == val[j]->number); + assert(V(v)->number == V(val[j])->number); j++; v = oldv; } @@ -318,7 +310,7 @@ test_fetch_verify (OMT omtree, TESTVALUE* val, u_int32_t len ) { assert(v != NULL); assert(v != oldv); assert(v == val[i]); - assert(v->number == val[i]->number); + assert(V(v)->number == V(val[i])->number); v = oldv; j = i - 1; @@ -327,7 +319,7 @@ test_fetch_verify (OMT omtree, TESTVALUE* val, u_int32_t len ) { assert(v != NULL); assert(v != oldv); assert(v == val[j]); - assert(v->number == val[j]->number); + assert(V(v)->number == V(val[j])->number); j--; v = oldv; } @@ -351,10 +343,10 @@ test_fetch_verify (OMT omtree, TESTVALUE* val, u_int32_t len ) { } static void -test_create_fetch_verify (enum create_type create_choice, enum close_when_done close) { +test_create_fetch_verify (enum create_type create_choice, enum close_when_done do_close) { test_create_from_sorted_array(create_choice, KEEP_WHEN_DONE); test_fetch_verify(omt, values, length); - test_close(close); + test_close(do_close); } static int iterate_helper_error_return = 1; @@ -365,7 +357,7 @@ iterate_helper (TESTVALUE v, u_int32_t idx, void* extra) { TESTVALUE* vals = (TESTVALUE *)extra; assert(v != NULL); assert(v == vals[idx]); - assert(v->number == vals[idx]->number); + assert(V(v)->number == V(vals[idx])->number); return 0; } @@ -386,10 +378,10 @@ test_iterate_verify (OMT omtree, TESTVALUE* vals, u_int32_t len) { } static void -test_create_iterate_verify (enum create_type create_choice, enum close_when_done close) { +test_create_iterate_verify (enum create_type create_choice, enum close_when_done do_close) { test_create_from_sorted_array(create_choice, KEEP_WHEN_DONE); test_iterate_verify(omt, values, length); - test_close(close); + test_close(do_close); } @@ -414,7 +406,7 @@ permute_array (u_int32_t* arr, u_int32_t len) { } static void -test_create_set_at (enum create_type create_choice, enum close_when_done close) { +test_create_set_at (enum create_type create_choice, enum close_when_done do_close) { u_int32_t i = 0; struct value* old_nums = NULL; @@ -463,7 +455,7 @@ test_create_set_at (enum create_type create_choice, enum close_when_done close) toku_free(old_values); toku_free(old_nums); - test_close(close); + test_close(do_close); } static int @@ -471,13 +463,13 @@ insert_helper (TESTVALUE value, void* extra_insert) { TESTVALUE to_insert = (OMTVALUE)extra_insert; assert(to_insert); - if (value->number < to_insert->number) return -1; - if (value->number > to_insert->number) return +1; + if (V(value)->number < V(to_insert)->number) return -1; + if (V(value)->number > V(to_insert)->number) return +1; return 0; } static void -test_create_insert (enum close_when_done close) { +test_create_insert (enum close_when_done do_close) { u_int32_t i = 0; u_int32_t* perm = NULL; @@ -500,10 +492,10 @@ test_create_insert (enum close_when_done close) { CKERR(r); assert(idx <= length); if (idx > 0) { - assert(to_insert->number > values[idx-1]->number); + assert(V(to_insert)->number > V(values[idx-1])->number); } if (idx < length) { - assert(to_insert->number < values[idx]->number); + assert(V(to_insert)->number < V(values[idx])->number); } length++; assert(length==toku_omt_size(omt)); @@ -519,7 +511,7 @@ test_create_insert (enum close_when_done close) { r = toku_omt_insert(omt, to_insert, insert_helper, to_insert, &idx); CKERR2(r, DB_KEYEXIST); assert(idx < length); - assert(values[idx]->number == to_insert->number); + assert(V(values[idx])->number == V(to_insert)->number); assert(length==toku_omt_size(omt)); test_iterate_verify(omt, values, length); @@ -528,11 +520,11 @@ test_create_insert (enum close_when_done close) { toku_free(perm); - test_close(close); + test_close(do_close); } static void -test_create_delete_at (enum create_type create_choice, enum close_when_done close) { +test_create_delete_at (enum create_type create_choice, enum close_when_done do_close) { u_int32_t i = 0; int r = ENOSYS; test_create_from_sorted_array(create_choice, KEEP_WHEN_DONE); @@ -562,11 +554,11 @@ test_create_delete_at (enum create_type create_choice, enum close_when_done clos assert(length == toku_omt_size(omt)); r = toku_omt_delete_at(omt, length+1); CKERR2(r, EINVAL); - test_close(close); + test_close(do_close); } static void -test_split_merge (enum create_type create_choice, enum close_when_done close) { +test_split_merge (enum create_type create_choice, enum close_when_done do_close) { int r = ENOSYS; u_int32_t i = 0; OMT left_split = NULL; @@ -623,7 +615,7 @@ test_split_merge (enum create_type create_choice, enum close_when_done close) { test_fetch_verify(omt, values, length); test_iterate_verify(omt, values, length); } - test_close(close); + test_close(do_close); } @@ -681,7 +673,7 @@ test_heaviside (OMTVALUE v_omt, void* x) { assert(v && x); assert(extra->first_zero <= extra->first_pos); - u_int32_t value = v->number; + u_int32_t value = V(v)->number; if (value < extra->first_zero) return -1; if (value < extra->first_pos) return 0; return 1; @@ -726,7 +718,7 @@ test_find_dir (int dir, void* extra, int (*h)(OMTVALUE, void*), found = FALSE; } else { - assert(omt_val->number == number_expect); + assert(V(omt_val)->number == number_expect); found = TRUE; } @@ -743,8 +735,8 @@ test_find_dir (int dir, void* extra, int (*h)(OMTVALUE, void*), if (found) assert(tmp==omt_val); assert(omt_val_curs != NULL); assert(omt_val_curs == tmp); - assert(omt_val_curs->number == tmp->number); - if (found) assert(omt_val_curs->number==number_expect); + assert(V(omt_val_curs)->number == V(tmp)->number); + if (found) assert(V(omt_val_curs)->number==number_expect); } toku_omt_cursor_invalidate(c); @@ -784,7 +776,7 @@ test_find_dir (int dir, void* extra, int (*h)(OMTVALUE, void*), assert(omt_val == NULL); } else { - assert(omt_val->number == number_expect); + assert(V(omt_val)->number == number_expect); } /* Verify we can pass NULL both. */ @@ -802,7 +794,7 @@ test_find_dir (int dir, void* extra, int (*h)(OMTVALUE, void*), } static void -test_find (enum create_type create_choice, enum close_when_done close) { +test_find (enum create_type create_choice, enum close_when_done do_close) { h_extra extra; init_identity_values(random_seed, 100); test_create_from_sorted_array(create_choice, KEEP_WHEN_DONE); @@ -872,7 +864,7 @@ test_find (enum create_type create_choice, enum close_when_done close) { test_find_dir(0, &extra, test_heaviside, 0, TRUE, length/3, length/3, TRUE); /* Cleanup */ - test_close(close); + test_close(do_close); } static void diff --git a/newbrt/tests/test-del-inorder.c b/newbrt/tests/test-del-inorder.c index ab0a7d0d100..d46646efd48 100644 --- a/newbrt/tests/test-del-inorder.c +++ b/newbrt/tests/test-del-inorder.c @@ -1,15 +1,6 @@ /* The goal of this test. Make sure that inserts stay behind deletes. */ -#include "brt.h" -#include "key.h" -#include "toku_assert.h" -#include "brt-internal.h" - - -#include -#include -#include - +#include "includes.h" static TOKUTXN const null_txn = 0; static DB * const null_db = 0; diff --git a/newbrt/tests/test-inc-split.c b/newbrt/tests/test-inc-split.c index a6438559943..66198cb8421 100644 --- a/newbrt/tests/test-inc-split.c +++ b/newbrt/tests/test-inc-split.c @@ -26,16 +26,7 @@ * */ -#include "brt.h" -#include "key.h" -#include "toku_assert.h" -#include "brt-internal.h" - - -#include -#include -#include - +#include "includes.h" static TOKUTXN const null_txn = 0; static DB * const null_db = 0;