cleanup: all functions have declarations (-Wmissing-prototypes)

Make sure that all non-static functions have a declaration.

Change-Id: Ie1596ad4ba876183862e51508c8bd7fc0451fc5e
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/src/rculfhash.c b/src/rculfhash.c
index 247564b8aa72f3d6ac7c87b1f1f12ab98ef5dc98..ca9c83c47ccd082b97753711b8298f7ebf96bd74 100644 (file)
--- a/src/rculfhash.c
+++ b/src/rculfhash.c
@@ -581,6 +581,7 @@ unsigned int cds_lfht_fls_ulong(unsigned long x)
  * Return the minimum order for which x <= (1UL << order).
  * Return -1 if x is 0.
  */
+static
 int cds_lfht_get_count_order_u32(uint32_t x)
 {
        if (!x)

diff --git a/tests/benchmark/test_mutex.c b/tests/benchmark/test_mutex.c
index e1bfc17cf38fc341380cdcbab9765537e414b72a..8da8b0428d8d8ec7b0e6899be26702f8d7d857c8 100644 (file)
--- a/tests/benchmark/test_mutex.c
+++ b/tests/benchmark/test_mutex.c
@@ -137,27 +137,7 @@ static unsigned int nr_writers;
 
 pthread_mutex_t rcu_copy_mutex = PTHREAD_MUTEX_INITIALIZER;
 
-void rcu_copy_mutex_lock(void)
-{
-       int ret;
-       ret = pthread_mutex_lock(&rcu_copy_mutex);
-       if (ret) {
-               perror("Error in pthread mutex lock");
-               exit(-1);
-       }
-}
-
-void rcu_copy_mutex_unlock(void)
-{
-       int ret;
-
-       ret = pthread_mutex_unlock(&rcu_copy_mutex);
-       if (ret) {
-               perror("Error in pthread mutex unlock");
-               exit(-1);
-       }
-}
-
+static
 void *thr_reader(void *data)
 {
        unsigned long tidx = (unsigned long)data;
@@ -192,6 +172,7 @@ void *thr_reader(void *data)
 
 }
 
+static
 void *thr_writer(void *data)
 {
        unsigned long wtidx = (unsigned long)data;
@@ -226,6 +207,7 @@ void *thr_writer(void *data)
        return ((void*)2);
 }
 
+static
 void show_usage(int argc, char **argv)
 {
        printf("Usage : %s nr_readers nr_writers duration (s) <OPTIONS>\n",

diff --git a/tests/benchmark/test_perthreadlock.c b/tests/benchmark/test_perthreadlock.c
index 6e079274448a899a686ce24b6e64de4b4a2767c4..ac21444191d55092c43474d7a405e9c3a4d072c1 100644 (file)
--- a/tests/benchmark/test_perthreadlock.c
+++ b/tests/benchmark/test_perthreadlock.c
@@ -165,6 +165,7 @@ static void urcu_mutex_unlock(pthread_mutex_t *lock)
        }
 }
 
+static
 void *thr_reader(void *data)
 {
        unsigned long tidx = (unsigned long)data;
@@ -199,6 +200,7 @@ void *thr_reader(void *data)
 
 }
 
+static
 void *thr_writer(void *data)
 {
        unsigned long wtidx = (unsigned long)data;
@@ -238,6 +240,7 @@ void *thr_writer(void *data)
        return ((void*)2);
 }
 
+static
 void show_usage(int argc, char **argv)
 {
        printf("Usage : %s nr_readers nr_writers duration (s) <OPTIONS>\n",

diff --git a/tests/benchmark/test_perthreadlock_timing.c b/tests/benchmark/test_perthreadlock_timing.c
index ca2953d0d43fdd705f42db6b766f5226d4f39a09..712eca1b2806e920832c016c93d550147ac98e9d 100644 (file)
--- a/tests/benchmark/test_perthreadlock_timing.c
+++ b/tests/benchmark/test_perthreadlock_timing.c
@@ -67,6 +67,7 @@ static int num_write;
 static caa_cycles_t __attribute__((aligned(CAA_CACHE_LINE_SIZE))) *reader_time;
 static caa_cycles_t __attribute__((aligned(CAA_CACHE_LINE_SIZE))) *writer_time;
 
+static
 void *thr_reader(void *arg)
 {
        caa_cycles_t time1, time2;
@@ -105,6 +106,7 @@ void *thr_reader(void *arg)
 
 }
 
+static
 void *thr_writer(void *arg)
 {
        caa_cycles_t time1, time2;

diff --git a/tests/benchmark/test_rwlock.c b/tests/benchmark/test_rwlock.c
index b6623c9bcc5dda868c47881857aef17dcc48195f..530db82f782be27b34990522a68023239732448d 100644 (file)
--- a/tests/benchmark/test_rwlock.c
+++ b/tests/benchmark/test_rwlock.c
@@ -137,27 +137,7 @@ static unsigned int nr_writers;
 
 pthread_mutex_t rcu_copy_mutex = PTHREAD_MUTEX_INITIALIZER;
 
-void rcu_copy_mutex_lock(void)
-{
-       int ret;
-       ret = pthread_mutex_lock(&rcu_copy_mutex);
-       if (ret) {
-               perror("Error in pthread mutex lock");
-               exit(-1);
-       }
-}
-
-void rcu_copy_mutex_unlock(void)
-{
-       int ret;
-
-       ret = pthread_mutex_unlock(&rcu_copy_mutex);
-       if (ret) {
-               perror("Error in pthread mutex unlock");
-               exit(-1);
-       }
-}
-
+static
 void *thr_reader(void *_count)
 {
        unsigned long long *count = _count;
@@ -204,6 +184,7 @@ void *thr_reader(void *_count)
 
 }
 
+static
 void *thr_writer(void *_count)
 {
        unsigned long long *count = _count;
@@ -251,6 +232,7 @@ void *thr_writer(void *_count)
        return ((void*)2);
 }
 
+static
 void show_usage(int argc, char **argv)
 {
        printf("Usage : %s nr_readers nr_writers duration (s) <OPTIONS>\n",

diff --git a/tests/benchmark/test_rwlock_timing.c b/tests/benchmark/test_rwlock_timing.c
index 0cc5253b7085c3426704ad9d5a2656d46bc51c9c..a7d035ea5c92ddcca2046939db56ce36bce688ee 100644 (file)
--- a/tests/benchmark/test_rwlock_timing.c
+++ b/tests/benchmark/test_rwlock_timing.c
@@ -67,6 +67,7 @@ static int num_write;
 static caa_cycles_t __attribute__((aligned(CAA_CACHE_LINE_SIZE))) *reader_time;
 static caa_cycles_t __attribute__((aligned(CAA_CACHE_LINE_SIZE))) *writer_time;
 
+static
 void *thr_reader(void *arg)
 {
        unsigned int i, j;
@@ -106,6 +107,7 @@ void *thr_reader(void *arg)
 
 }
 
+static
 void *thr_writer(void *arg)
 {
        unsigned int i, j;

diff --git a/tests/benchmark/test_urcu.c b/tests/benchmark/test_urcu.c
index 9982f6d2667537068028af06853112677a544b18..19ddf342f7d51319222d31500dfef236ae408523 100644 (file)
--- a/tests/benchmark/test_urcu.c
+++ b/tests/benchmark/test_urcu.c
@@ -128,27 +128,7 @@ static unsigned int nr_writers;
 
 pthread_mutex_t rcu_copy_mutex = PTHREAD_MUTEX_INITIALIZER;
 
-void rcu_copy_mutex_lock(void)
-{
-       int ret;
-       ret = pthread_mutex_lock(&rcu_copy_mutex);
-       if (ret) {
-               perror("Error in pthread mutex lock");
-               exit(-1);
-       }
-}
-
-void rcu_copy_mutex_unlock(void)
-{
-       int ret;
-
-       ret = pthread_mutex_unlock(&rcu_copy_mutex);
-       if (ret) {
-               perror("Error in pthread mutex unlock");
-               exit(-1);
-       }
-}
-
+static
 void *thr_reader(void *_count)
 {
        unsigned long long *count = _count;
@@ -195,6 +175,7 @@ void *thr_reader(void *_count)
 
 }
 
+static
 void *thr_writer(void *_count)
 {
        unsigned long long *count = _count;
@@ -234,6 +215,7 @@ void *thr_writer(void *_count)
        return ((void*)2);
 }
 
+static
 void show_usage(int argc, char **argv)
 {
        printf("Usage : %s nr_readers nr_writers duration (s) <OPTIONS>\n",

diff --git a/tests/benchmark/test_urcu_assign.c b/tests/benchmark/test_urcu_assign.c
index 966cf9e56609e269229786d71d6c48a1e861a16c..a7189a7bbf0d641f5bc40488a009f5543db1aa57 100644 (file)
--- a/tests/benchmark/test_urcu_assign.c
+++ b/tests/benchmark/test_urcu_assign.c
@@ -132,6 +132,7 @@ static unsigned int nr_writers;
 
 pthread_mutex_t rcu_copy_mutex = PTHREAD_MUTEX_INITIALIZER;
 
+static
 void rcu_copy_mutex_lock(void)
 {
        int ret;
@@ -142,6 +143,7 @@ void rcu_copy_mutex_lock(void)
        }
 }
 
+static
 void rcu_copy_mutex_unlock(void)
 {
        int ret;
@@ -186,6 +188,7 @@ static void test_array_free(struct test_array *ptr)
        ptr->a = ARRAY_POISON;
 }
 
+static
 void *thr_reader(void *_count)
 {
        unsigned long long *count = _count;
@@ -226,6 +229,7 @@ void *thr_reader(void *_count)
 
 }
 
+static
 void *thr_writer(void *_count)
 {
        unsigned long long *count = _count;
@@ -267,6 +271,7 @@ void *thr_writer(void *_count)
        return ((void*)2);
 }
 
+static
 void show_usage(int argc, char **argv)
 {
        printf("Usage : %s nr_readers nr_writers duration (s) <OPTIONS>\n",

diff --git a/tests/benchmark/test_urcu_bp.c b/tests/benchmark/test_urcu_bp.c
index cf5c0fe074b2b2793e2a70e4670bf03d51e92ff3..2c51d0ba34effd92f0367f3b9e07a81b93c57ca9 100644 (file)
--- a/tests/benchmark/test_urcu_bp.c
+++ b/tests/benchmark/test_urcu_bp.c
@@ -128,27 +128,7 @@ static unsigned int nr_writers;
 
 pthread_mutex_t rcu_copy_mutex = PTHREAD_MUTEX_INITIALIZER;
 
-void rcu_copy_mutex_lock(void)
-{
-       int ret;
-       ret = pthread_mutex_lock(&rcu_copy_mutex);
-       if (ret) {
-               perror("Error in pthread mutex lock");
-               exit(-1);
-       }
-}
-
-void rcu_copy_mutex_unlock(void)
-{
-       int ret;
-
-       ret = pthread_mutex_unlock(&rcu_copy_mutex);
-       if (ret) {
-               perror("Error in pthread mutex unlock");
-               exit(-1);
-       }
-}
-
+static
 void *thr_reader(void *_count)
 {
        unsigned long long *count = _count;
@@ -191,6 +171,7 @@ void *thr_reader(void *_count)
 
 }
 
+static
 void *thr_writer(void *_count)
 {
        unsigned long long *count = _count;
@@ -229,6 +210,7 @@ void *thr_writer(void *_count)
        return ((void*)2);
 }
 
+static
 void show_usage(int argc, char **argv)
 {
        printf("Usage : %s nr_readers nr_writers duration (s) <OPTIONS>\n",

diff --git a/tests/benchmark/test_urcu_defer.c b/tests/benchmark/test_urcu_defer.c
index 97eadab0014a00466b1c744aacd9a241efeebd78..9f24de7cdac945c58c00029801bfb127ced684ef 100644 (file)
--- a/tests/benchmark/test_urcu_defer.c
+++ b/tests/benchmark/test_urcu_defer.c
@@ -136,27 +136,7 @@ static unsigned int nr_writers;
 
 pthread_mutex_t rcu_copy_mutex = PTHREAD_MUTEX_INITIALIZER;
 
-void rcu_copy_mutex_lock(void)
-{
-       int ret;
-       ret = pthread_mutex_lock(&rcu_copy_mutex);
-       if (ret) {
-               perror("Error in pthread mutex lock");
-               exit(-1);
-       }
-}
-
-void rcu_copy_mutex_unlock(void)
-{
-       int ret;
-
-       ret = pthread_mutex_unlock(&rcu_copy_mutex);
-       if (ret) {
-               perror("Error in pthread mutex unlock");
-               exit(-1);
-       }
-}
-
+static
 void *thr_reader(void *_count)
 {
        unsigned long long *count = _count;
@@ -205,6 +185,7 @@ static void test_cb1(void *data)
 {
 }
 
+static
 void *thr_writer(void *data)
 {
        unsigned long wtidx = (unsigned long)data;
@@ -256,6 +237,7 @@ void *thr_writer(void *data)
        return ((void*)2);
 }
 
+static
 void show_usage(int argc, char **argv)
 {
        printf("Usage : %s nr_readers nr_writers duration (s) <OPTIONS>\n",

diff --git a/tests/benchmark/test_urcu_gc.c b/tests/benchmark/test_urcu_gc.c
index 2ee0d229fa229baddb0506fa4bf066437203896c..2f35fe982555017088174700d62db0209e42db9a 100644 (file)
--- a/tests/benchmark/test_urcu_gc.c
+++ b/tests/benchmark/test_urcu_gc.c
@@ -144,27 +144,7 @@ static unsigned int nr_writers;
 
 pthread_mutex_t rcu_copy_mutex = PTHREAD_MUTEX_INITIALIZER;
 
-void rcu_copy_mutex_lock(void)
-{
-       int ret;
-       ret = pthread_mutex_lock(&rcu_copy_mutex);
-       if (ret) {
-               perror("Error in pthread mutex lock");
-               exit(-1);
-       }
-}
-
-void rcu_copy_mutex_unlock(void)
-{
-       int ret;
-
-       ret = pthread_mutex_unlock(&rcu_copy_mutex);
-       if (ret) {
-               perror("Error in pthread mutex unlock");
-               exit(-1);
-       }
-}
-
+static
 void *thr_reader(void *_count)
 {
        unsigned long long *count = _count;
@@ -236,6 +216,7 @@ static void rcu_gc_reclaim(unsigned long wtidx, void *old)
        rcu_gc_clear_queue(wtidx);
 }
 
+static
 void *thr_writer(void *data)
 {
        unsigned long wtidx = (unsigned long)data;
@@ -277,6 +258,7 @@ void *thr_writer(void *data)
        return ((void*)2);
 }
 
+static
 void show_usage(int argc, char **argv)
 {
        printf("Usage : %s nr_readers nr_writers duration (s) <OPTIONS>\n",

diff --git a/tests/benchmark/test_urcu_hash.c b/tests/benchmark/test_urcu_hash.c
index 2aa1e9df9ac55f44f9e9e138c2207090ee9ac80c..2410ff72058a15b48c2132408a6a785e40df42cc 100644 (file)
--- a/tests/benchmark/test_urcu_hash.c
+++ b/tests/benchmark/test_urcu_hash.c
@@ -56,26 +56,31 @@ struct test_hash_cb test_hash_cb[] = {
 
 static enum test_hash test_choice = TEST_HASH_RW;
 
+static
 void (*get_sigusr1_cb(void))(int)
 {
        return test_hash_cb[test_choice].sigusr1;
 }
 
+static
 void (*get_sigusr2_cb(void))(int)
 {
        return test_hash_cb[test_choice].sigusr2;
 }
 
+static
 void *(*get_thr_reader_cb(void))(void *)
 {
        return test_hash_cb[test_choice].thr_reader;
 }
 
+static
 void *(*get_thr_writer_cb(void))(void *)
 {
        return test_hash_cb[test_choice].thr_writer;
 }
 
+static
 int (*get_populate_hash_cb(void))(void)
 {
        return test_hash_cb[test_choice].populate_hash;
@@ -194,6 +199,7 @@ unsigned long test_compare(const void *key1, size_t key1_len,
                return 1;
 }
 
+static
 void *thr_count(void *arg)
 {
        printf_verbose("thread_begin %s, tid %lu\n",
@@ -259,6 +265,7 @@ void test_delete_all_nodes(struct cds_lfht *ht)
        printf("deleted %lu nodes.\n", count);
 }
 
+static
 void show_usage(int argc, char **argv)
 {
        printf("Usage : %s nr_readers nr_writers duration (s) <OPTIONS>\n",

diff --git a/tests/benchmark/test_urcu_lfq.c b/tests/benchmark/test_urcu_lfq.c
index 45a6bb9eafc0ee9dfbbdd9a293245b0bf51ee377..77ccb85b0e777714b624547b0d7a0986c1188fc7 100644 (file)
--- a/tests/benchmark/test_urcu_lfq.c
+++ b/tests/benchmark/test_urcu_lfq.c
@@ -134,6 +134,7 @@ struct test {
 
 static struct cds_lfq_queue_rcu q;
 
+static
 void *thr_enqueuer(void *_count)
 {
        unsigned long long *count = _count;
@@ -189,6 +190,7 @@ void free_node_cb(struct rcu_head *head)
        free(node);
 }
 
+static
 void *thr_dequeuer(void *_count)
 {
        unsigned long long *count = _count;
@@ -238,6 +240,7 @@ void *thr_dequeuer(void *_count)
        return ((void*)2);
 }
 
+static
 void test_end(struct cds_lfq_queue_rcu *q, unsigned long long *nr_dequeues)
 {
        struct cds_lfq_node_rcu *snode;
@@ -254,6 +257,7 @@ void test_end(struct cds_lfq_queue_rcu *q, unsigned long long *nr_dequeues)
        } while (snode);
 }
 
+static
 void show_usage(int argc, char **argv)
 {
        printf("Usage : %s nr_dequeuers nr_enqueuers duration (s) <OPTIONS>\n",

diff --git a/tests/benchmark/test_urcu_lfs_rcu.c b/tests/benchmark/test_urcu_lfs_rcu.c
index 69da6b4fb829a08d8b0da339c9ef41d475c91f4a..a26460a420721f55265bd969b8efbe11da0043cc 100644 (file)
--- a/tests/benchmark/test_urcu_lfs_rcu.c
+++ b/tests/benchmark/test_urcu_lfs_rcu.c
@@ -138,6 +138,7 @@ struct test {
 
 static struct cds_lfs_stack_rcu s;
 
+static
 void *thr_enqueuer(void *_count)
 {
        unsigned long long *count = _count;
@@ -192,6 +193,7 @@ void free_node_cb(struct rcu_head *head)
        free(node);
 }
 
+static
 void *thr_dequeuer(void *_count)
 {
        unsigned long long *count = _count;
@@ -240,6 +242,7 @@ void *thr_dequeuer(void *_count)
        return ((void*)2);
 }
 
+static
 void test_end(struct cds_lfs_stack_rcu *s, unsigned long long *nr_dequeues)
 {
        struct cds_lfs_node_rcu *snode;
@@ -256,6 +259,7 @@ void test_end(struct cds_lfs_stack_rcu *s, unsigned long long *nr_dequeues)
        } while (snode);
 }
 
+static
 void show_usage(int argc, char **argv)
 {
        printf("Usage : %s nr_dequeuers nr_enqueuers duration (s) <OPTIONS>\n",

diff --git a/tests/benchmark/test_urcu_qsbr.c b/tests/benchmark/test_urcu_qsbr.c
index aceb52747e90ab116999b7ec90a1a24c89c72a68..f2f3b76482d75444e083e04adf054822d1158ced 100644 (file)
--- a/tests/benchmark/test_urcu_qsbr.c
+++ b/tests/benchmark/test_urcu_qsbr.c
@@ -127,27 +127,7 @@ static unsigned int nr_writers;
 
 pthread_mutex_t rcu_copy_mutex = PTHREAD_MUTEX_INITIALIZER;
 
-void rcu_copy_mutex_lock(void)
-{
-       int ret;
-       ret = pthread_mutex_lock(&rcu_copy_mutex);
-       if (ret) {
-               perror("Error in pthread mutex lock");
-               exit(-1);
-       }
-}
-
-void rcu_copy_mutex_unlock(void)
-{
-       int ret;
-
-       ret = pthread_mutex_unlock(&rcu_copy_mutex);
-       if (ret) {
-               perror("Error in pthread mutex unlock");
-               exit(-1);
-       }
-}
-
+static
 void *thr_reader(void *_count)
 {
        unsigned long long *count = _count;
@@ -201,6 +181,7 @@ void *thr_reader(void *_count)
 
 }
 
+static
 void *thr_writer(void *_count)
 {
        unsigned long long *count = _count;
@@ -240,6 +221,7 @@ void *thr_writer(void *_count)
        return ((void*)2);
 }
 
+static
 void show_usage(int argc, char **argv)
 {
        printf("Usage : %s nr_readers nr_writers duration (s) <OPTIONS>\n",

diff --git a/tests/benchmark/test_urcu_qsbr_gc.c b/tests/benchmark/test_urcu_qsbr_gc.c
index 2ec602a473aafcbd425bbf80671d359a666c3171..eacdf2ee5ebd848556fc45d41291b5c06caa6d0a 100644 (file)
--- a/tests/benchmark/test_urcu_qsbr_gc.c
+++ b/tests/benchmark/test_urcu_qsbr_gc.c
@@ -141,28 +141,7 @@ pthread_mutex_t rcu_copy_mutex = PTHREAD_MUTEX_INITIALIZER;
 static
 unsigned long long __attribute__((aligned(CAA_CACHE_LINE_SIZE))) *tot_nr_writes;
 
-
-void rcu_copy_mutex_lock(void)
-{
-       int ret;
-       ret = pthread_mutex_lock(&rcu_copy_mutex);
-       if (ret) {
-               perror("Error in pthread mutex lock");
-               exit(-1);
-       }
-}
-
-void rcu_copy_mutex_unlock(void)
-{
-       int ret;
-
-       ret = pthread_mutex_unlock(&rcu_copy_mutex);
-       if (ret) {
-               perror("Error in pthread mutex unlock");
-               exit(-1);
-       }
-}
-
+static
 void *thr_reader(void *_count)
 {
        unsigned long long *count = _count;
@@ -237,6 +216,7 @@ static void rcu_gc_reclaim(unsigned long wtidx, void *old)
        rcu_gc_clear_queue(wtidx);
 }
 
+static
 void *thr_writer(void *data)
 {
        unsigned long wtidx = (unsigned long)data;
@@ -278,6 +258,7 @@ void *thr_writer(void *data)
        return ((void*)2);
 }
 
+static
 void show_usage(int argc, char **argv)
 {
        printf("Usage : %s nr_readers nr_writers duration (s) <OPTIONS>\n",

diff --git a/tests/benchmark/test_urcu_qsbr_timing.c b/tests/benchmark/test_urcu_qsbr_timing.c
index 75e6faa3b45c6f005123ae807e7df986ec362147..71d8d8d806179b23c11c2b978892ba02304e2e1c 100644 (file)
--- a/tests/benchmark/test_urcu_qsbr_timing.c
+++ b/tests/benchmark/test_urcu_qsbr_timing.c
@@ -39,6 +39,7 @@
 
 pthread_mutex_t rcu_copy_mutex = PTHREAD_MUTEX_INITIALIZER;
 
+static
 void rcu_copy_mutex_lock(void)
 {
        int ret;
@@ -49,6 +50,7 @@ void rcu_copy_mutex_lock(void)
        }
 }
 
+static
 void rcu_copy_mutex_unlock(void)
 {
        int ret;
@@ -83,6 +85,7 @@ static int num_write;
 static caa_cycles_t __attribute__((aligned(CAA_CACHE_LINE_SIZE))) *reader_time;
 static caa_cycles_t __attribute__((aligned(CAA_CACHE_LINE_SIZE))) *writer_time;
 
+static
 void *thr_reader(void *arg)
 {
        unsigned int i, j;
@@ -120,6 +123,7 @@ void *thr_reader(void *arg)
 
 }
 
+static
 void *thr_writer(void *arg)
 {
        unsigned int i, j;

diff --git a/tests/benchmark/test_urcu_timing.c b/tests/benchmark/test_urcu_timing.c
index b5f3e4a81bb4af0e0f1f97dd8ded9cbc9d6c5434..44911f5c86d807c17bf9cdc263a5a7d205508f14 100644 (file)
--- a/tests/benchmark/test_urcu_timing.c
+++ b/tests/benchmark/test_urcu_timing.c
@@ -39,6 +39,7 @@
 
 pthread_mutex_t rcu_copy_mutex = PTHREAD_MUTEX_INITIALIZER;
 
+static
 void rcu_copy_mutex_lock(void)
 {
        int ret;
@@ -49,6 +50,7 @@ void rcu_copy_mutex_lock(void)
        }
 }
 
+static
 void rcu_copy_mutex_unlock(void)
 {
        int ret;
@@ -83,6 +85,7 @@ static int num_write;
 static caa_cycles_t __attribute__((aligned(CAA_CACHE_LINE_SIZE))) *reader_time;
 static caa_cycles_t __attribute__((aligned(CAA_CACHE_LINE_SIZE))) *writer_time;
 
+static
 void *thr_reader(void *arg)
 {
        unsigned int i, j;
@@ -119,6 +122,7 @@ void *thr_reader(void *arg)
 
 }
 
+static
 void *thr_writer(void *arg)
 {
        unsigned int i, j;

diff --git a/tests/benchmark/test_urcu_wfq.c b/tests/benchmark/test_urcu_wfq.c
index 79ff716c34f153ae66b9e1fe0cd5bc9fa6b35ad7..c68a45380a4a0e1c4f1106bb9b122f688d769ac8 100644 (file)
--- a/tests/benchmark/test_urcu_wfq.c
+++ b/tests/benchmark/test_urcu_wfq.c
@@ -133,6 +133,7 @@ static unsigned int nr_dequeuers;
 
 static struct cds_wfq_queue q;
 
+static
 void *thr_enqueuer(void *_count)
 {
        unsigned long long *count = _count;
@@ -174,6 +175,7 @@ fail:
 
 }
 
+static
 void *thr_dequeuer(void *_count)
 {
        unsigned long long *count = _count;
@@ -213,6 +215,7 @@ void *thr_dequeuer(void *_count)
        return ((void*)2);
 }
 
+static
 void test_end(struct cds_wfq_queue *q, unsigned long long *nr_dequeues)
 {
        struct cds_wfq_node *node;
@@ -226,6 +229,7 @@ void test_end(struct cds_wfq_queue *q, unsigned long long *nr_dequeues)
        } while (node);
 }
 
+static
 void show_usage(int argc, char **argv)
 {
        printf("Usage : %s nr_dequeuers nr_enqueuers duration (s) <OPTIONS>\n",

diff --git a/tests/common/api.h b/tests/common/api.h
index 5ca045c66cab375e75ce2f8747c860ade6038ff2..67c388e13465ff322b02dda79e35579a7ee12f7a 100644 (file)
--- a/tests/common/api.h
+++ b/tests/common/api.h
@@ -243,6 +243,7 @@ static void run_on(int cpu)
  * timekeeping -- very crude -- should use MONOTONIC...
  */
 
+static inline
 long long get_microseconds(void)
 {
        struct timeval tv;

diff --git a/tests/regression/rcutorture.h b/tests/regression/rcutorture.h
index 9a2f9a1f581ffc5c34e4ce0c5f2ed2a12e114b75..46a673767ebd4d8ccc02063621a13f783149bfe9 100644 (file)
--- a/tests/regression/rcutorture.h
+++ b/tests/regression/rcutorture.h
@@ -128,6 +128,7 @@ volatile int goflag __attribute__((__aligned__(CAA_CACHE_LINE_SIZE)))
  * Performance test.
  */
 
+static
 void *rcu_read_perf_test(void *arg)
 {
        int i;
@@ -158,6 +159,7 @@ void *rcu_read_perf_test(void *arg)
        return (NULL);
 }
 
+static
 void *rcu_update_perf_test(void *arg)
 {
        long long n_updates_local = 0;
@@ -189,6 +191,7 @@ void *rcu_update_perf_test(void *arg)
        return NULL;
 }
 
+static
 void perftestinit(void)
 {
        init_per_thread(n_reads_pt, 0LL);
@@ -196,6 +199,7 @@ void perftestinit(void)
        uatomic_set(&nthreadsrunning, 0);
 }
 
+static
 int perftestrun(int nthreads, int nreaders, int nupdaters)
 {
        int t;
@@ -229,6 +233,7 @@ int perftestrun(int nthreads, int nreaders, int nupdaters)
        return 0;
 }
 
+static
 int perftest(int nreaders, int cpustride)
 {
        int i;
@@ -244,6 +249,7 @@ int perftest(int nreaders, int cpustride)
        return perftestrun(i + 1, nreaders, 1);
 }
 
+static
 int rperftest(int nreaders, int cpustride)
 {
        int i;
@@ -258,6 +264,7 @@ int rperftest(int nreaders, int cpustride)
        return perftestrun(i, nreaders, 0);
 }
 
+static
 int uperftest(int nupdaters, int cpustride)
 {
        int i;
@@ -292,6 +299,7 @@ DEFINE_PER_THREAD(long long [RCU_STRESS_PIPE_LEN + 1], rcu_stress_count);
 
 int garbage = 0;
 
+static
 void *rcu_read_stress_test(void *arg)
 {
        int i;
@@ -335,6 +343,7 @@ void *rcu_read_stress_test(void *arg)
 static pthread_mutex_t call_rcu_test_mutex = PTHREAD_MUTEX_INITIALIZER;
 static pthread_cond_t call_rcu_test_cond = PTHREAD_COND_INITIALIZER;
 
+static
 void rcu_update_stress_test_rcu(struct rcu_head *head)
 {
        int ret;
@@ -362,6 +371,7 @@ void rcu_update_stress_test_rcu(struct rcu_head *head)
        }
 }
 
+static
 void *rcu_update_stress_test(void *arg)
 {
        int i;
@@ -435,6 +445,7 @@ void *rcu_update_stress_test(void *arg)
        return NULL;
 }
 
+static
 void *rcu_fake_update_stress_test(void *arg)
 {
        if (callrcu_type == CALLRCU_PERTHREAD) {
@@ -462,6 +473,7 @@ void *rcu_fake_update_stress_test(void *arg)
        return NULL;
 }
 
+static
 int stresstest(int nreaders)
 {
        int i;
@@ -519,6 +531,7 @@ int stresstest(int nreaders)
  * Mainprogram.
  */
 
+static
 void usage(int argc, char *argv[])
 {
        diag("Usage: %s nreaders [ perf | rperf | uperf | stress ] [ stride ] [ callrcu_global | callrcu_percpu | callrcu_perthread ]\n", argv[0]);