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

-#include "brt-internal.h"
-#include "toku_assert.h"
+#include "includes.h"
 
 int toku_testsetup_leaf(BRT brt, BLOCKNUM *blocknum) {
     BRTNODE node;

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);

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"

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)

newbrt/tests/brt-serialize-test.c

 /* -*- 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 <fcntl.h>
-#include <string.h>
-#include <zlib.h>
-#include <arpa/inet.h>
-#include <stdlib.h>
+#include "includes.h"
 
 static void test_serialize(void) {
     //    struct brt source_brt;

newbrt/tests/brt-test-cursor-2.c

 /* -*- 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 <fcntl.h>
-#include <stdio.h>
-#include <string.h>
-#include <sys/time.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <arpa/inet.h>
-
+#include "includes.h"
 #include "test.h"
 
 static const char fname[]= __FILE__ ".brt";

newbrt/tests/brt-test-cursor.c

 /* -*- 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 <fcntl.h>
-#include <stdio.h>
-#include <string.h>
-#include <sys/time.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <arpa/inet.h>
-
+#include "includes.h"
 #include "test.h"
 
 static const char fname[]= __FILE__ ".brt";

newbrt/tests/brt-test.c

 /* -*- 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 <fcntl.h>
-#include <stdio.h>
-#include <string.h>
-#include <sys/time.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <arpa/inet.h>
-
+#include "includes.h"
 #include "test.h"
 
 static TOKUTXN const null_txn = 0;

newbrt/tests/brt-test3.c

 /* -*- 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 <fcntl.h>
-#include <stdio.h>
-#include <string.h>
-#include <sys/time.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <arpa/inet.h>
-
+#include "includes.h"
 #include "test.h"
 
 static const char fname[]= __FILE__ ".brt";

newbrt/tests/brt-test4.c

 /* -*- 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 <fcntl.h>
-#include <stdio.h>
-#include <string.h>
-#include <sys/time.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <arpa/inet.h>
-
+#include "includes.h"
 #include "test.h"
 
 static const char fname[]= __FILE__ ".brt";

newbrt/tests/cachetable-count-pinned-test.c

-#include <stdio.h>
-#include <unistd.h>
-#include <assert.h>
-
+#include "includes.h"
 #include "test.h"
-#include "cachetable.h"
 
 static void
 flush (CACHEFILE f __attribute__((__unused__)),

newbrt/tests/cachetable-debug-test.c

-#include <stdio.h>
-#include <unistd.h>
-#include <assert.h>
-
+#include "includes.h"
 #include "test.h"
-#include "cachetable.h"
 
 static void
 flush (CACHEFILE f __attribute__((__unused__)),

newbrt/tests/cachetable-fd-test.c

-#include <stdio.h>
-#include <unistd.h>
-#include <assert.h>
-#include <errno.h>
-
+#include "includes.h"
 #include "test.h"
-#include "cachetable.h"
 
 static void
 cachetable_fd_test (void) {

newbrt/tests/cachetable-flush-test.c

-#include <stdio.h>
-#include <unistd.h>
-#include <assert.h>
-
+#include "includes.h"
 #include "test.h"
-#include "cachetable.h"
 
 static void
 flush (CACHEFILE f __attribute__((__unused__)),

newbrt/tests/cachetable-getandpin-test.c

-#include <stdio.h>
-#include <unistd.h>
-#include <assert.h>
-
+#include "includes.h"
 #include "test.h"
-#include "cachetable.h"
 
 static void
 flush (CACHEFILE cf     __attribute__((__unused__)),

newbrt/tests/cachetable-put-test.c

-#include <stdio.h>
-#include <unistd.h>
-#include <assert.h>
-
+#include "includes.h"
 #include "test.h"
-#include "cachetable.h"
 
 static void
 flush (CACHEFILE f __attribute__((__unused__)),

newbrt/tests/cachetable-rename-test.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
 #ident "Copyright (c) 2007, 2008 Tokutek Inc.  All rights reserved."
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdint.h>
-#include <string.h>
-#include <unistd.h>
-#include <malloc.h>
-#include <errno.h>
-#include <pthread.h>
-
-#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

newbrt/tests/cachetable-rwlock-test.c

-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <assert.h>
-#include <errno.h>
-#include <string.h>
-#include <pthread.h>
-
-#include "cachetable-rwlock.h"
+#include "includes.h"
 
 int verbose = 0;
 

newbrt/tests/cachetable-scan.c

 /* How fast can we read a file usng the cachetable interface. */
 #ident "Copyright (c) 2007, 2008 Tokutek Inc.  All rights reserved."
 
-#include <assert.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <sys/time.h>
-#include <sys/resource.h>
-
-#include "cachetable.h"
+#include "includes.h"
 
 enum { KEYLIMIT = 4, BLOCKSIZE=1<<20, N=2048};
 

newbrt/tests/cachetable-test.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
 #ident "Copyright (c) 2007, 2008 Tokutek Inc.  All rights reserved."
 
-#include <inttypes.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdint.h>
-#include <string.h>
-#include <unistd.h>
-#include <malloc.h>
-#include <errno.h>
-#include <pthread.h>
-
-#include "toku_assert.h"
-#include "memory.h"
-#include "cachetable.h"
+#include "includes.h"
 #include "test.h"
 
 #if 0

newbrt/tests/cachetable-test2.c

 /* -*- mode: C; c-basic-offset: 4 -*- */
 #ident "Copyright (c) 2007, 2008 Tokutek Inc.  All rights reserved."
 
-#include <inttypes.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <pthread.h>
-
-#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

newbrt/tests/cachetable-unpin-test.c

-#include <stdio.h>
-#include <unistd.h>
-#include <assert.h>
-
+#include "includes.h"
 #include "test.h"
-#include "cachetable.h"
 
 static void
 flush (CACHEFILE f __attribute__((__unused__)),

newbrt/tests/cachetable-writequeue-test.c

-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <assert.h>
-#include <errno.h>
-#include <string.h>
-#include <pthread.h>
+#include "includes.h"
 
 int verbose;
 

newbrt/tests/omt-cursor-test.c

-#include <sys/types.h>
-#include <assert.h>
-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);

newbrt/tests/test-del-inorder.c

 /* 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 <stdio.h>
-#include <string.h>
-#include <unistd.h>
-
+#include "includes.h"
 
 static TOKUTXN const null_txn = 0;
 static DB * const null_db = 0;

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 <stdio.h>
-#include <string.h>
-#include <unistd.h>
-
+#include "includes.h"
 
 static TOKUTXN const null_txn = 0;
 static DB * const null_db = 0;