X-Git-Url: https://git.lttng.org/?p=urcu.git;a=blobdiff_plain;f=tests%2Fbenchmark%2Ftest_urcu_wfs.c;h=2c82c019577a5454fef2047c1c570b5813d26465;hp=266884d441e93bf37d792450a51bcdb1384a9e54;hb=83e334d03eaba62df373cf44298616458900078a;hpb=99ab1528d4df0c35bd209063c42123d1bc2f81ea

diff --git a/tests/benchmark/test_urcu_wfs.c b/tests/benchmark/test_urcu_wfs.c
index 266884d..2c82c01 100644
--- a/tests/benchmark/test_urcu_wfs.c
+++ b/tests/benchmark/test_urcu_wfs.c
@@ -78,7 +78,7 @@ static inline void loop_sleep(unsigned long loops)
 static int verbose_mode;
 
 static int test_pop, test_pop_all, test_wait_empty;
-static int test_enqueue_stopped;
+static unsigned int test_enqueue_stopped;
 
 #define printf_verbose(fmt, args...)		\
 	do {					\
@@ -344,6 +344,7 @@ int main(int argc, char **argv)
 			   tot_pop_all = 0, tot_pop_last = 0;
 	unsigned long long end_dequeues = 0;
 	int i, a, retval = 0;
+	unsigned int i_thr;
 
 	if (argc < 4) {
 		show_usage(argc, argv);
@@ -361,7 +362,7 @@ int main(int argc, char **argv)
 		show_usage(argc, argv);
 		return -1;
 	}
-	
+
 	err = sscanf(argv[3], "%lu", &duration);
 	if (err != 1) {
 		show_usage(argc, argv);
@@ -458,15 +459,15 @@ int main(int argc, char **argv)
 
 	next_aff = 0;
 
-	for (i = 0; i < nr_enqueuers; i++) {
+	for (i_thr = 0; i_thr < nr_enqueuers; i_thr++) {
 		err = pthread_create(&tid_enqueuer[i], NULL, thr_enqueuer,
-				     &count_enqueuer[3 * i]);
+				     &count_enqueuer[3 * i_thr]);
 		if (err != 0)
 			exit(1);
 	}
-	for (i = 0; i < nr_dequeuers; i++) {
-		err = pthread_create(&tid_dequeuer[i], NULL, thr_dequeuer,
-				     &count_dequeuer[4 * i]);
+	for (i_thr = 0; i_thr < nr_dequeuers; i_thr++) {
+		err = pthread_create(&tid_dequeuer[i_thr], NULL, thr_dequeuer,
+				     &count_dequeuer[4 * i_thr]);
 		if (err != 0)
 			exit(1);
 	}
@@ -475,7 +476,7 @@ int main(int argc, char **argv)
 
 	test_go = 1;
 
-	for (i = 0; i < duration; i++) {
+	for (i_thr = 0; i_thr < duration; i_thr++) {
 		sleep(1);
 		if (verbose_mode) {
 			fwrite(".", sizeof(char), 1, stdout);
@@ -496,24 +497,24 @@ int main(int argc, char **argv)
 
 	test_stop_dequeue = 1;
 
-	for (i = 0; i < nr_enqueuers; i++) {
-		err = pthread_join(tid_enqueuer[i], &tret);
+	for (i_thr = 0; i_thr < nr_enqueuers; i_thr++) {
+		err = pthread_join(tid_enqueuer[i_thr], &tret);
 		if (err != 0)
 			exit(1);
-		tot_enqueues += count_enqueuer[3 * i];
-		tot_successful_enqueues += count_enqueuer[3 * i + 1];
-		tot_empty_dest_enqueues += count_enqueuer[3 * i + 2];
+		tot_enqueues += count_enqueuer[3 * i_thr];
+		tot_successful_enqueues += count_enqueuer[3 * i_thr + 1];
+		tot_empty_dest_enqueues += count_enqueuer[3 * i_thr + 2];
 	}
-	for (i = 0; i < nr_dequeuers; i++) {
-		err = pthread_join(tid_dequeuer[i], &tret);
+	for (i_thr = 0; i_thr < nr_dequeuers; i_thr++) {
+		err = pthread_join(tid_dequeuer[i_thr], &tret);
 		if (err != 0)
 			exit(1);
-		tot_dequeues += count_dequeuer[4 * i];
-		tot_successful_dequeues += count_dequeuer[4 * i + 1];
-		tot_pop_all += count_dequeuer[4 * i + 2];
-		tot_pop_last += count_dequeuer[4 * i + 3];
+		tot_dequeues += count_dequeuer[4 * i_thr];
+		tot_successful_dequeues += count_dequeuer[4 * i_thr + 1];
+		tot_pop_all += count_dequeuer[4 * i_thr + 2];
+		tot_pop_last += count_dequeuer[4 * i_thr + 3];
 	}
-	
+
 	test_end(&s, &end_dequeues, &tot_pop_last);
 
 	printf_verbose("total number of enqueues : %llu, dequeues %llu\n",
@@ -557,10 +558,12 @@ int main(int argc, char **argv)
 			tot_pop_last);
 		retval = 1;
 	}
+
 	cds_wfs_destroy(&s);
 	free(count_enqueuer);
 	free(count_dequeuer);
 	free(tid_enqueuer);
 	free(tid_dequeuer);
+
 	return retval;
 }