fix: shadowed local variable (-Wshadow)

[urcu.git] / tests / benchmark / test_urcu_wfq.c

diff --git a/tests/benchmark/test_urcu_wfq.c b/tests/benchmark/test_urcu_wfq.c
index deabdbf12307aca0ee339d2cfcf1c77264696fbe..bc9e89fb9bb29601734892b4b1f3dea0a01f7c9d 100644 (file)
--- a/tests/benchmark/test_urcu_wfq.c
+++ b/tests/benchmark/test_urcu_wfq.c
@@ -21,8 +21,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#define _GNU_SOURCE
-#include "config.h"
 #include <stdio.h>
 #include <pthread.h>
 #include <stdlib.h>
@@ -38,7 +36,6 @@
 
 #include <urcu/arch.h>
 #include <urcu/tls-compat.h>
-#include "cpuset.h"
 #include "thread-id.h"
 
 /* hardcoded number of CPUs */
@@ -108,11 +105,7 @@ static void set_affinity(void)
 
        CPU_ZERO(&mask);
        CPU_SET(cpu, &mask);
-#if SCHED_SETAFFINITY_ARGS == 2
-       sched_setaffinity(0, &mask);
-#else
        sched_setaffinity(0, sizeof(mask), &mask);
-#endif
 #endif /* HAVE_SCHED_SETAFFINITY */
 }
 
@@ -140,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;
@@ -181,6 +175,7 @@ fail:
 
 }
 
+static
 void *thr_dequeuer(void *_count)
 {
        unsigned long long *count = _count;
@@ -220,19 +215,21 @@ void *thr_dequeuer(void *_count)
        return ((void*)2);
 }
 
-void test_end(struct cds_wfq_queue *q, unsigned long long *nr_dequeues)
+static
+void test_end(unsigned long long *nr_dequeues_l)
 {
        struct cds_wfq_node *node;
 
        do {
-               node = cds_wfq_dequeue_blocking(q);
+               node = cds_wfq_dequeue_blocking(&q);
                if (node) {
                        free(node);
-                       (*nr_dequeues)++;
+                       (*nr_dequeues_l)++;
                }
        } while (node);
 }
 
+static
 void show_usage(int argc, char **argv)
 {
        printf("Usage : %s nr_dequeuers nr_enqueuers duration (s) <OPTIONS>\n",
@@ -256,6 +253,7 @@ int main(int argc, char **argv)
                           tot_successful_dequeues = 0;
        unsigned long long end_dequeues = 0;
        int i, a;
+       unsigned int i_thr;
 
        if (argc < 4) {
                show_usage(argc, argv);
@@ -273,7 +271,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);
@@ -330,15 +328,15 @@ int main(int argc, char **argv)
 
        next_aff = 0;
 
-       for (i = 0; i < nr_enqueuers; i++) {
-               err = pthread_create(&tid_enqueuer[i], NULL, thr_enqueuer,
-                                    &count_enqueuer[2 * i]);
+       for (i_thr = 0; i_thr < nr_enqueuers; i_thr++) {
+               err = pthread_create(&tid_enqueuer[i_thr], NULL, thr_enqueuer,
+                                    &count_enqueuer[2 * 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[2 * i]);
+       for (i_thr = 0; i_thr < nr_dequeuers; i_thr++) {
+               err = pthread_create(&tid_dequeuer[i_thr], NULL, thr_dequeuer,
+                                    &count_dequeuer[2 * i_thr]);
                if (err != 0)
                        exit(1);
        }
@@ -347,30 +345,32 @@ 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)
-                       (void) write(1, ".", 1);
+               if (verbose_mode) {
+                       fwrite(".", sizeof(char), 1, stdout);
+                       fflush(stdout);
+               }
        }
 
        test_stop = 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[2 * i];
-               tot_successful_enqueues += count_enqueuer[2 * i + 1];
+               tot_enqueues += count_enqueuer[2 * i_thr];
+               tot_successful_enqueues += count_enqueuer[2 * i_thr + 1];
        }
-       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[2 * i];
-               tot_successful_dequeues += count_dequeuer[2 * i + 1];
+               tot_dequeues += count_dequeuer[2 * i_thr];
+               tot_successful_dequeues += count_dequeuer[2 * i_thr + 1];
        }
-       
-       test_end(&q, &end_dequeues);
+
+       test_end(&end_dequeues);
 
        printf_verbose("total number of enqueues : %llu, dequeues %llu\n",
                       tot_enqueues, tot_dequeues);
@@ -393,9 +393,11 @@ int main(int argc, char **argv)
                       tot_successful_enqueues,
                       tot_successful_dequeues + end_dequeues);
 
+       cds_wfq_destroy(&q);
        free(count_enqueuer);
        free(count_dequeuer);
        free(tid_enqueuer);
        free(tid_dequeuer);
+
        return 0;
 }