app/testpmd: fix uninitialized members of MPLS

[dpdk.git] / app / test / test_rcu_qsbr.c

diff --git a/app/test/test_rcu_qsbr.c b/app/test/test_rcu_qsbr.c
index 2f71ec6..b60dc50 100644 (file)
--- a/app/test/test_rcu_qsbr.c
+++ b/app/test/test_rcu_qsbr.c
@@ -9,6 +9,7 @@
 #include <rte_hash_crc.h>
 #include <rte_malloc.h>
 #include <rte_cycles.h>
+#include <rte_random.h>
 #include <unistd.h>
 
 #include "test.h"
@@ -25,8 +26,8 @@
 /* Make sure that this has the same value as __RTE_QSBR_CNT_INIT */
 #define TEST_RCU_QSBR_CNT_INIT 1
 
-uint16_t enabled_core_ids[RTE_MAX_LCORE];
-unsigned int num_cores;
+static uint16_t enabled_core_ids[RTE_MAX_LCORE];
+static unsigned int num_cores;
 
 static uint32_t *keys;
 #define TOTAL_ENTRY (1024 * 8)
@@ -35,8 +36,8 @@ static uint32_t *hash_data[RTE_MAX_LCORE][TOTAL_ENTRY];
 static uint8_t writer_done;
 
 static struct rte_rcu_qsbr *t[RTE_MAX_LCORE];
-struct rte_hash *h[RTE_MAX_LCORE];
-char hash_name[RTE_MAX_LCORE][8];
+static struct rte_hash *h[RTE_MAX_LCORE];
+static char hash_name[RTE_MAX_LCORE][8];
 
 struct test_rcu_thread_info {
        /* Index in RCU array */
@@ -46,7 +47,7 @@ struct test_rcu_thread_info {
        /* lcore IDs registered on the RCU variable */
        uint16_t r_core_ids[2];
 };
-struct test_rcu_thread_info thread_info[RTE_MAX_LCORE/4];
+static struct test_rcu_thread_info thread_info[RTE_MAX_LCORE/4];
 
 static int
 alloc_rcu(void)
@@ -168,6 +169,7 @@ test_rcu_qsbr_thread_unregister(void)
 {
        unsigned int num_threads[3] = {1, RTE_MAX_LCORE, 1};
        unsigned int i, j;
+       unsigned int skip_thread_id;
        uint64_t token;
        int ret;
 
@@ -227,10 +229,11 @@ test_rcu_qsbr_thread_unregister(void)
                token = rte_rcu_qsbr_start(t[0]);
                TEST_RCU_QSBR_RETURN_IF_ERROR(
                        (token != (TEST_RCU_QSBR_CNT_INIT + 1)), "QSBR Start");
+               skip_thread_id = rte_rand() % RTE_MAX_LCORE;
                /* Update quiescent state counter */
                for (i = 0; i < num_threads[j]; i++) {
                        /* Skip one update */
-                       if (i == (RTE_MAX_LCORE - 10))
+                       if ((j == 1) && (i == skip_thread_id))
                                continue;
                        rte_rcu_qsbr_quiescent(t[0],
                                (j == 2) ? (RTE_MAX_LCORE - 1) : i);
@@ -242,7 +245,7 @@ test_rcu_qsbr_thread_unregister(void)
                        TEST_RCU_QSBR_RETURN_IF_ERROR((ret == 0),
                                                "Non-blocking QSBR check");
                        /* Update the previously skipped thread */
-                       rte_rcu_qsbr_quiescent(t[0], RTE_MAX_LCORE - 10);
+                       rte_rcu_qsbr_quiescent(t[0], skip_thread_id);
                }
 
                /* Validate the updates */