Don't refer to lcore_config directly.
Signed-off-by: Stephen Hemminger <step...@networkplumber.org>
Reviewed-by: David Marchand <david.march...@redhat.com>
---
app/test/test_cryptodev.c | 2 +-
app/test/test_hash_readwrite_lf.c | 14 +++++++-------
app/test/test_ring_perf.c | 22 ++++++++++++----------
app/test/test_stack_perf.c | 20 ++++++++++----------
4 files changed, 30 insertions(+), 28 deletions(-)
diff --git a/app/test/test_cryptodev.c b/app/test/test_cryptodev.c
index 9f31aaa7e6b2..eca6d3db16a5 100644
--- a/app/test/test_cryptodev.c
+++ b/app/test/test_cryptodev.c
@@ -378,7 +378,7 @@ testsuite_setup(void)
strcpy(temp_str, vdev_args);
strlcat(temp_str, ";", sizeof(temp_str));
slave_core_count++;
- socket_id = lcore_config[i].socket_id;
+ socket_id = rte_lcore_to_socket_id(i);
}
if (slave_core_count != 2) {
RTE_LOG(ERR, USER1,
diff --git a/app/test/test_hash_readwrite_lf.c
b/app/test/test_hash_readwrite_lf.c
index 4ab4c8ee64cf..1361a8aa4c9c 100644
--- a/app/test/test_hash_readwrite_lf.c
+++ b/app/test/test_hash_readwrite_lf.c
@@ -741,7 +741,7 @@ test_hash_add_no_ks_lookup_hit(struct rwc_perf
*rwc_perf_results, int rwc_lf,
rte_eal_mp_wait_lcore();
for (i = 1; i <= rwc_core_cnt[n]; i++)
- if (lcore_config[i].ret < 0)
+ if (rte_lcore_return_code(i) < 0)
goto err;
unsigned long long cycles_per_lookup =
@@ -813,7 +813,7 @@ test_hash_add_no_ks_lookup_miss(struct rwc_perf
*rwc_perf_results, int rwc_lf,
if (ret < 0)
goto err;
for (i = 1; i <= rwc_core_cnt[n]; i++)
- if (lcore_config[i].ret < 0)
+ if (rte_lcore_return_code(i) < 0)
goto err;
unsigned long long cycles_per_lookup =
@@ -889,7 +889,7 @@ test_hash_add_ks_lookup_hit_non_sp(struct rwc_perf
*rwc_perf_results,
if (ret < 0)
goto err;
for (i = 1; i <= rwc_core_cnt[n]; i++)
- if (lcore_config[i].ret < 0)
+ if (rte_lcore_return_code(i) < 0)
goto err;
unsigned long long cycles_per_lookup =
@@ -965,7 +965,7 @@ test_hash_add_ks_lookup_hit_sp(struct rwc_perf
*rwc_perf_results, int rwc_lf,
if (ret < 0)
goto err;
for (i = 1; i <= rwc_core_cnt[n]; i++)
- if (lcore_config[i].ret < 0)
+ if (rte_lcore_return_code(i) < 0)
goto err;
unsigned long long cycles_per_lookup =
@@ -1040,7 +1040,7 @@ test_hash_add_ks_lookup_miss(struct rwc_perf
*rwc_perf_results, int rwc_lf, int
if (ret < 0)
goto err;
for (i = 1; i <= rwc_core_cnt[n]; i++)
- if (lcore_config[i].ret < 0)
+ if (rte_lcore_return_code(i) < 0)
goto err;
unsigned long long cycles_per_lookup =
@@ -1141,7 +1141,7 @@ test_hash_multi_add_lookup(struct rwc_perf
*rwc_perf_results, int rwc_lf,
rte_eal_mp_wait_lcore();
for (i = 1; i <= rwc_core_cnt[n]; i++)
- if (lcore_config[i].ret < 0)
+ if (rte_lcore_return_code(i) < 0)
goto err;
unsigned long long cycles_per_lookup =
@@ -1225,7 +1225,7 @@ test_hash_add_ks_lookup_hit_extbkt(struct rwc_perf
*rwc_perf_results,
rte_eal_mp_wait_lcore();
for (i = 1; i <= rwc_core_cnt[n]; i++)
- if (lcore_config[i].ret < 0)
+ if (rte_lcore_return_code(i) < 0)
goto err;
unsigned long long cycles_per_lookup =
diff --git a/app/test/test_ring_perf.c b/app/test/test_ring_perf.c
index ebb3939f51d0..6eccccfe93b4 100644
--- a/app/test/test_ring_perf.c
+++ b/app/test/test_ring_perf.c
@@ -52,10 +52,11 @@ get_two_hyperthreads(struct lcore_pair *lcp)
RTE_LCORE_FOREACH(id2) {
if (id1 == id2)
continue;
- c1 = lcore_config[id1].core_id;
- c2 = lcore_config[id2].core_id;
- s1 = lcore_config[id1].socket_id;
- s2 = lcore_config[id2].socket_id;
+
+ c1 = rte_lcore_to_cpu_id(id1);
+ c2 = rte_lcore_to_cpu_id(id2);
+ s1 = rte_lcore_to_socket_id(id1);
+ s2 = rte_lcore_to_socket_id(id2);
if ((c1 == c2) && (s1 == s2)){
lcp->c1 = id1;
lcp->c2 = id2;
@@ -75,10 +76,11 @@ get_two_cores(struct lcore_pair *lcp)
RTE_LCORE_FOREACH(id2) {
if (id1 == id2)
continue;
- c1 = lcore_config[id1].core_id;
- c2 = lcore_config[id2].core_id;
- s1 = lcore_config[id1].socket_id;
- s2 = lcore_config[id2].socket_id;
+
+ c1 = rte_lcore_to_cpu_id(id1);
+ c2 = rte_lcore_to_cpu_id(id2);
+ s1 = rte_lcore_to_socket_id(id1);
+ s2 = rte_lcore_to_socket_id(id2);
if ((c1 != c2) && (s1 == s2)){
lcp->c1 = id1;
lcp->c2 = id2;
@@ -98,8 +100,8 @@ get_two_sockets(struct lcore_pair *lcp)
RTE_LCORE_FOREACH(id2) {
if (id1 == id2)
continue;
- s1 = lcore_config[id1].socket_id;
- s2 = lcore_config[id2].socket_id;
+ s1 = rte_lcore_to_socket_id(id1);
+ s2 = rte_lcore_to_socket_id(id2);
if (s1 != s2){
lcp->c1 = id1;
lcp->c2 = id2;
diff --git a/app/test/test_stack_perf.c b/app/test/test_stack_perf.c
index ba27fbf7076d..70561fecda0d 100644
--- a/app/test/test_stack_perf.c
+++ b/app/test/test_stack_perf.c
@@ -44,10 +44,10 @@ get_two_hyperthreads(struct lcore_pair *lcp)
RTE_LCORE_FOREACH(id[1]) {
if (id[0] == id[1])
continue;
- core[0] = lcore_config[id[0]].core_id;
- core[1] = lcore_config[id[1]].core_id;
- socket[0] = lcore_config[id[0]].socket_id;
- socket[1] = lcore_config[id[1]].socket_id;
+ core[0] = rte_lcore_to_cpu_id(id[0]);
+ core[1] = rte_lcore_to_cpu_id(id[1]);
+ socket[0] = rte_lcore_to_socket_id(id[0]);
+ socket[1] = rte_lcore_to_socket_id(id[1]);
if ((core[0] == core[1]) && (socket[0] == socket[1])) {
lcp->c1 = id[0];
lcp->c2 = id[1];
@@ -70,10 +70,10 @@ get_two_cores(struct lcore_pair *lcp)
RTE_LCORE_FOREACH(id[1]) {
if (id[0] == id[1])
continue;
- core[0] = lcore_config[id[0]].core_id;
- core[1] = lcore_config[id[1]].core_id;
- socket[0] = lcore_config[id[0]].socket_id;
- socket[1] = lcore_config[id[1]].socket_id;
+ core[0] = rte_lcore_to_cpu_id(id[0]);
+ core[1] = rte_lcore_to_cpu_id(id[1]);
+ socket[0] = rte_lcore_to_socket_id(id[0]);
+ socket[1] = rte_lcore_to_socket_id(id[1]);
if ((core[0] != core[1]) && (socket[0] == socket[1])) {
lcp->c1 = id[0];
lcp->c2 = id[1];
@@ -95,8 +95,8 @@ get_two_sockets(struct lcore_pair *lcp)
RTE_LCORE_FOREACH(id[1]) {
if (id[0] == id[1])
continue;
- socket[0] = lcore_config[id[0]].socket_id;
- socket[1] = lcore_config[id[1]].socket_id;
+ socket[0] = rte_lcore_to_socket_id(id[0]);
+ socket[1] = rte_lcore_to_socket_id(id[1]);
if (socket[0] != socket[1]) {
lcp->c1 = id[0];
lcp->c2 = id[1];
--
2.17.1
