From: Michael Jeanson Date: Thu, 1 Apr 2021 17:46:18 +0000 (-0400) Subject: fix: shadowed local variable (-Wshadow) X-Git-Tag: v0.13.0~21 X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=bd23a6c64e8ccff9a666441958e34793748ebd3a;p=userspace-rcu.git fix: shadowed local variable (-Wshadow) Rename local variables that are shadowed by global variables. Change-Id: Ic60e880cb6e98d6111e6b747d9668731a156e4fa Signed-off-by: Michael Jeanson Signed-off-by: Mathieu Desnoyers --- diff --git a/tests/benchmark/test_urcu_hash.c b/tests/benchmark/test_urcu_hash.c index 2410ff7..d7e09b3 100644 --- a/tests/benchmark/test_urcu_hash.c +++ b/tests/benchmark/test_urcu_hash.c @@ -691,11 +691,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) { diff --git a/tests/benchmark/test_urcu_lfq.c b/tests/benchmark/test_urcu_lfq.c index 77ccb85..454481e 100644 --- a/tests/benchmark/test_urcu_lfq.c +++ b/tests/benchmark/test_urcu_lfq.c @@ -241,18 +241,18 @@ void *thr_dequeuer(void *_count) } static -void test_end(struct cds_lfq_queue_rcu *q, unsigned long long *nr_dequeues) +void test_end(unsigned long long *nr_dequeues_l) { struct cds_lfq_node_rcu *snode; do { - snode = cds_lfq_dequeue_rcu(q); + snode = cds_lfq_dequeue_rcu(&q); if (snode) { struct test *node; node = caa_container_of(snode, struct test, list); free(node); /* no more concurrent access */ - (*nr_dequeues)++; + (*nr_dequeues_l)++; } } while (snode); } @@ -402,7 +402,7 @@ int main(int argc, char **argv) tot_successful_dequeues += count_dequeuer[2 * i_thr + 1]; } - test_end(&q, &end_dequeues); + test_end(&end_dequeues); err = cds_lfq_destroy_rcu(&q); assert(!err); diff --git a/tests/benchmark/test_urcu_lfs.c b/tests/benchmark/test_urcu_lfs.c index 84c33f8..8265735 100644 --- a/tests/benchmark/test_urcu_lfs.c +++ b/tests/benchmark/test_urcu_lfs.c @@ -301,18 +301,18 @@ static void *thr_dequeuer(void *_count) return ((void*)2); } -static void test_end(struct cds_lfs_stack *s, unsigned long long *nr_dequeues) +static void test_end(unsigned long long *nr_dequeues_l) { struct cds_lfs_node *snode; do { - snode = __cds_lfs_pop(s); + snode = __cds_lfs_pop(&s); if (snode) { struct test *node; node = caa_container_of(snode, struct test, list); free(node); - (*nr_dequeues)++; + (*nr_dequeues_l)++; } } while (snode); } @@ -486,7 +486,7 @@ int main(int argc, char **argv) tot_successful_dequeues += count_dequeuer[2 * i_thr + 1]; } - test_end(&s, &end_dequeues); + test_end(&end_dequeues); printf_verbose("total number of enqueues : %llu, dequeues %llu\n", tot_enqueues, tot_dequeues); diff --git a/tests/benchmark/test_urcu_lfs_rcu.c b/tests/benchmark/test_urcu_lfs_rcu.c index a26460a..13d9e5e 100644 --- a/tests/benchmark/test_urcu_lfs_rcu.c +++ b/tests/benchmark/test_urcu_lfs_rcu.c @@ -243,18 +243,18 @@ void *thr_dequeuer(void *_count) } static -void test_end(struct cds_lfs_stack_rcu *s, unsigned long long *nr_dequeues) +void test_end(unsigned long long *nr_dequeues_l) { struct cds_lfs_node_rcu *snode; do { - snode = cds_lfs_pop_rcu(s); + snode = cds_lfs_pop_rcu(&s); if (snode) { struct test *node; node = caa_container_of(snode, struct test, list); free(node); - (*nr_dequeues)++; + (*nr_dequeues_l)++; } } while (snode); } @@ -404,7 +404,7 @@ int main(int argc, char **argv) tot_successful_dequeues += count_dequeuer[2 * i_thr + 1]; } - test_end(&s, &end_dequeues); + test_end(&end_dequeues); printf_verbose("total number of enqueues : %llu, dequeues %llu\n", tot_enqueues, tot_dequeues); diff --git a/tests/benchmark/test_urcu_wfcq.c b/tests/benchmark/test_urcu_wfcq.c index 221f7c3..9f87925 100644 --- a/tests/benchmark/test_urcu_wfcq.c +++ b/tests/benchmark/test_urcu_wfcq.c @@ -303,8 +303,8 @@ static void *thr_dequeuer(void *_count) return ((void*)2); } -static void test_end(unsigned long long *nr_dequeues, - unsigned long long *nr_dequeue_last) +static void test_end(unsigned long long *nr_dequeues_l, + unsigned long long *nr_dequeue_last_l) { struct cds_wfcq_node *node; int state; @@ -314,9 +314,9 @@ static void test_end(unsigned long long *nr_dequeues, &state); if (node) { if (state & CDS_WFCQ_STATE_LAST) - (*nr_dequeue_last)++; + (*nr_dequeue_last_l)++; free(node); - (*nr_dequeues)++; + (*nr_dequeues_l)++; } } while (node); } diff --git a/tests/benchmark/test_urcu_wfq.c b/tests/benchmark/test_urcu_wfq.c index c68a453..bc9e89f 100644 --- a/tests/benchmark/test_urcu_wfq.c +++ b/tests/benchmark/test_urcu_wfq.c @@ -216,15 +216,15 @@ void *thr_dequeuer(void *_count) } static -void test_end(struct cds_wfq_queue *q, unsigned long long *nr_dequeues) +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); } @@ -370,7 +370,7 @@ int main(int argc, char **argv) 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); diff --git a/tests/benchmark/test_urcu_wfs.c b/tests/benchmark/test_urcu_wfs.c index 25c12b7..982be19 100644 --- a/tests/benchmark/test_urcu_wfs.c +++ b/tests/benchmark/test_urcu_wfs.c @@ -291,19 +291,19 @@ static void *thr_dequeuer(void *_count) return ((void*)2); } -static void test_end(struct cds_wfs_stack *s, unsigned long long *nr_dequeues, - unsigned long long *nr_pop_last) +static void test_end(unsigned long long *nr_dequeues_l, + unsigned long long *nr_pop_last_l) { struct cds_wfs_node *node; int state; do { - node = cds_wfs_pop_with_state_blocking(s, &state); + node = cds_wfs_pop_with_state_blocking(&s, &state); if (node) { if (state & CDS_WFS_STATE_LAST) - (*nr_pop_last)++; + (*nr_pop_last_l)++; free(node); - (*nr_dequeues)++; + (*nr_dequeues_l)++; } } while (node); } @@ -510,7 +510,7 @@ int main(int argc, char **argv) tot_pop_last += count_dequeuer[4 * i_thr + 3]; } - test_end(&s, &end_dequeues, &tot_pop_last); + test_end(&end_dequeues, &tot_pop_last); printf_verbose("total number of enqueues : %llu, dequeues %llu\n", tot_enqueues, tot_dequeues);