X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=tests%2Fbenchmark%2Ftest_urcu_hash.c;h=606851baf37ee1b5a84e63b9e8c3cbe3e2a74e48;hb=HEAD;hp=d7e09b325f58f5b3641bb2e5354b8b82f58d63d9;hpb=bd23a6c64e8ccff9a666441958e34793748ebd3a;p=urcu.git

diff --git a/tests/benchmark/test_urcu_hash.c b/tests/benchmark/test_urcu_hash.c
index d7e09b3..606851b 100644
--- a/tests/benchmark/test_urcu_hash.c
+++ b/tests/benchmark/test_urcu_hash.c
@@ -1,23 +1,9 @@
+// SPDX-FileCopyrightText: 2009-2012 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+//
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 /*
- * test_urcu_hash.c
- *
  * Userspace RCU library - test program
- *
- * Copyright 2009-2012 - Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #include "test_urcu_hash.h"
@@ -96,8 +82,6 @@ DEFINE_URCU_TLS(unsigned long, lookup_ok);
 
 struct cds_lfht *test_ht;
 
-volatile int test_go, test_stop;
-
 unsigned long wdelay;
 
 unsigned long duration;
@@ -140,7 +124,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 */
@@ -148,7 +132,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");
@@ -192,7 +176,7 @@ unsigned long test_compare(const void *key1, size_t key1_len,
 {
 	if (caa_unlikely(key1_len != key2_len))
 		return -1;
-	assert(key1_len == sizeof(unsigned long));
+	urcu_posix_assert(key1_len == sizeof(unsigned long));
 	if (key1 == key2)
 		return 0;
 	else
@@ -200,7 +184,7 @@ unsigned long test_compare(const void *key1, size_t key1_len,
 }
 
 static
-void *thr_count(void *arg)
+void *thr_count(void *arg __attribute__((unused)))
 {
 	printf_verbose("thread_begin %s, tid %lu\n",
 			"counter", urcu_get_thread_id());
@@ -258,7 +242,7 @@ void test_delete_all_nodes(struct cds_lfht *ht)
 		int ret;
 
 		ret = cds_lfht_del(test_ht, cds_lfht_iter_get_node(&iter));
-		assert(!ret);
+		urcu_posix_assert(!ret);
 		call_rcu(&node->head, free_node_cb);
 		count++;
 	}
@@ -266,7 +250,7 @@ void test_delete_all_nodes(struct cds_lfht *ht)
 }
 
 static
-void show_usage(int argc, char **argv)
+void show_usage(char **argv)
 {
 	printf("Usage : %s nr_readers nr_writers duration (s) <OPTIONS>\n",
 		argv[0]);
@@ -319,28 +303,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;
 	}
@@ -357,7 +341,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;
 			}
@@ -368,7 +352,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;
 			}
@@ -376,7 +360,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;
 			}
@@ -387,7 +371,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;
 			}
@@ -395,7 +379,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;
 			}
@@ -403,7 +387,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;
 			}
@@ -434,7 +418,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;
 			}
@@ -599,7 +583,7 @@ int main(int argc, char **argv)
 	 */
 	rcu_register_thread();
 	ret = (get_populate_hash_cb())();
-	assert(!ret);
+	urcu_posix_assert(!ret);
 
 	rcu_thread_offline();
 
@@ -649,14 +633,14 @@ int main(int argc, char **argv)
 
 	cmm_smp_mb();
 
-	test_go = 1;
+	begin_test();
 
 	remain = duration;
 	do {
 		remain = sleep(remain);
 	} while (remain > 0);
 
-	test_stop = 1;
+	end_test();
 
 end_pthread_join:
 	for (i_thr = 0; i_thr < nr_readers_created; i_thr++) {