[v4,5/5] test: use lcore accessors
Checks
Commit Message
From: Stephen Hemminger <stephen@networkplumber.org>
Don't refer to lcore_config directly.
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
Signed-off-by: David Marchand <david.marchand@redhat.com>
---
app/test/test_cryptodev.c | 2 +-
app/test/test_ring_perf.c | 22 ++++++++++++----------
app/test/test_stack_perf.c | 20 ++++++++++----------
3 files changed, 23 insertions(+), 21 deletions(-)
---
Changelog since v3:
- updated title
- removed parts on test_hash_readwrite_lf
@@ -378,7 +378,7 @@ struct crypto_unittest_params {
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,
@@ -52,10 +52,11 @@ struct lcore_pair {
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 @@ struct lcore_pair {
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 @@ struct lcore_pair {
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;
@@ -44,10 +44,10 @@ struct lcore_pair {
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 @@ struct lcore_pair {
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 @@ struct lcore_pair {
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];