X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=tests%2Fbenchmark%2Ftest_urcu_hash.c;h=a8a79e3fcb45bf9b8c73060ee0ce98c615fb9cf5;hb=1a93fffc1204c6cd94ba62bf2448a612ac27ad39;hp=376f3b15075063653c1995d9eab1a690c28c7ccf;hpb=83e334d03eaba62df373cf44298616458900078a;p=urcu.git

diff --git a/tests/benchmark/test_urcu_hash.c b/tests/benchmark/test_urcu_hash.c
index 376f3b1..a8a79e3 100644
--- 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;
@@ -135,7 +140,7 @@ static pthread_mutex_t rcu_copy_mutex = PTHREAD_MUTEX_INITIALIZER;
 
 void set_affinity(void)
 {
-#if HAVE_SCHED_SETAFFINITY
+#ifdef HAVE_SCHED_SETAFFINITY
 	cpu_set_t mask;
 	int cpu, ret;
 #endif /* HAVE_SCHED_SETAFFINITY */
@@ -143,7 +148,7 @@ void set_affinity(void)
 	if (!use_affinity)
 		return;
 
-#if HAVE_SCHED_SETAFFINITY
+#ifdef HAVE_SCHED_SETAFFINITY
 	ret = pthread_mutex_lock(&affinity_mutex);
 	if (ret) {
 		perror("Error in pthread mutex lock");
@@ -198,7 +203,8 @@ unsigned long test_compare(const void *key1, size_t key1_len,
 		return 1;
 }
 
-void *thr_count(void *arg)
+static
+void *thr_count(void *arg __attribute__((unused)))
 {
 	printf_verbose("thread_begin %s, tid %lu\n",
 			"counter", urcu_get_thread_id());
@@ -263,7 +269,8 @@ void test_delete_all_nodes(struct cds_lfht *ht)
 	printf("deleted %lu nodes.\n", count);
 }
 
-void show_usage(int argc, char **argv)
+static
+void show_usage(char **argv)
 {
 	printf("Usage : %s nr_readers nr_writers duration (s) <OPTIONS>\n",
 		argv[0]);
@@ -316,28 +323,28 @@ int main(int argc, char **argv)
 	long long nr_leaked;
 
 	if (argc < 4) {
-		show_usage(argc, argv);
+		show_usage(argv);
 		mainret = 1;
 		goto end;
 	}
 
 	err = sscanf(argv[1], "%u", &nr_readers);
 	if (err != 1) {
-		show_usage(argc, argv);
+		show_usage(argv);
 		mainret = 1;
 		goto end;
 	}
 
 	err = sscanf(argv[2], "%u", &nr_writers);
 	if (err != 1) {
-		show_usage(argc, argv);
+		show_usage(argv);
 		mainret = 1;
 		goto end;
 	}
 
 	err = sscanf(argv[3], "%lu", &duration);
 	if (err != 1) {
-		show_usage(argc, argv);
+		show_usage(argv);
 		mainret = 1;
 		goto end;
 	}
@@ -354,7 +361,7 @@ int main(int argc, char **argv)
 			break;
 		case 'a':
 			if (argc < i + 2) {
-				show_usage(argc, argv);
+				show_usage(argv);
 				mainret = 1;
 				goto end;
 			}
@@ -365,7 +372,7 @@ int main(int argc, char **argv)
 			break;
 		case 'c':
 			if (argc < i + 2) {
-				show_usage(argc, argv);
+				show_usage(argv);
 				mainret = 1;
 				goto end;
 			}
@@ -373,7 +380,7 @@ int main(int argc, char **argv)
 			break;
 		case 'd':
 			if (argc < i + 2) {
-				show_usage(argc, argv);
+				show_usage(argv);
 				mainret = 1;
 				goto end;
 			}
@@ -384,7 +391,7 @@ int main(int argc, char **argv)
 			break;
 		case 'h':
 			if (argc < i + 2) {
-				show_usage(argc, argv);
+				show_usage(argv);
 				mainret = 1;
 				goto end;
 			}
@@ -392,7 +399,7 @@ int main(int argc, char **argv)
 			break;
 		case 'm':
 			if (argc < i + 2) {
-				show_usage(argc, argv);
+				show_usage(argv);
 				mainret = 1;
 				goto end;
 			}
@@ -400,7 +407,7 @@ int main(int argc, char **argv)
 			break;
 		case 'n':
 			if (argc < i + 2) {
-				show_usage(argc, argv);
+				show_usage(argv);
 				mainret = 1;
 				goto end;
 			}
@@ -431,7 +438,7 @@ int main(int argc, char **argv)
 			break;
 		case 'B':
 			if (argc < i + 2) {
-				show_usage(argc, argv);
+				show_usage(argv);
 				mainret = 1;
 				goto end;
 			}
@@ -688,11 +695,11 @@ end_pthread_join:
 	}
 	{
 		char msg[1] = { 0x42 };
-		ssize_t ret;
+		ssize_t sret;
 
 		do {
-			ret = write(count_pipe[1], msg, 1);	/* wakeup thread */
-		} while (ret == -1L && errno == EINTR);
+			sret = write(count_pipe[1], msg, 1);	/* wakeup thread */
+		} while (sret == -1L && errno == EINTR);
 	}
 	err = pthread_join(tid_count, &tret);
 	if (err != 0) {