When the main core is set as tx/rx/sched/worker core, it also needs to
print some information to show this. Thus, add info output for the main
core, and add a "dump" function to print core information for the sake
of code simplicity and easy maintenance.

In the meanwhile, fix the count error. For the variable "worker_idx", it
should be incremented when the core is set as worker core. However, when
the main core is set as rx/tx/sched core, the worker_idx is also
incremented. Though this error may not have a substantial impact due to
that the main core is the last launched core, but it should be corrected
from the perspective of code correctness.

Fixes: 1094ca96689c ("doc: add SW eventdev pipeline to sample app guide")
Cc: harry.van.haa...@intel.com
Cc: sta...@dpdk.org

Signed-off-by: Feifei Wang <feifei.wa...@arm.com>
Reviewed-by: Ruifeng Wang <ruifeng.w...@arm.com>
---
 examples/eventdev_pipeline/main.c | 55 +++++++++++++++++++------------
 1 file changed, 34 insertions(+), 21 deletions(-)

diff --git a/examples/eventdev_pipeline/main.c 
b/examples/eventdev_pipeline/main.c
index e9a591134..3526d4d3d 100644
--- a/examples/eventdev_pipeline/main.c
+++ b/examples/eventdev_pipeline/main.c
@@ -22,6 +22,32 @@ struct config_data cdata = {
        .worker_cq_depth = 16
 };
 
+static void
+dump_core_info(unsigned int lcore_id, struct worker_data *data,
+               unsigned int worker_idx)
+{
+       if (fdata->rx_core[lcore_id])
+               printf(
+                       "[%s()] lcore %d executing NIC Rx\n",
+                       __func__, lcore_id);
+
+       if (fdata->tx_core[lcore_id])
+               printf(
+                       "[%s()] lcore %d executing NIC Tx\n",
+                       __func__, lcore_id);
+
+       if (fdata->sched_core[lcore_id])
+               printf(
+                       "[%s()] lcore %d executing scheduler\n",
+                       __func__, lcore_id);
+
+       if (fdata->worker_core[lcore_id])
+               printf(
+                       "[%s()] lcore %d executing worker, using eventdev port 
%u\n",
+                       __func__, lcore_id,
+                       data[worker_idx].port_id);
+}
+
 static bool
 core_in_use(unsigned int lcore_id) {
        return (fdata->rx_core[lcore_id] || fdata->sched_core[lcore_id] ||
@@ -411,25 +437,7 @@ main(int argc, char **argv)
                        !fdata->sched_core[lcore_id])
                        continue;
 
-               if (fdata->rx_core[lcore_id])
-                       printf(
-                               "[%s()] lcore %d executing NIC Rx\n",
-                               __func__, lcore_id);
-
-               if (fdata->tx_core[lcore_id])
-                       printf(
-                               "[%s()] lcore %d executing NIC Tx\n",
-                               __func__, lcore_id);
-
-               if (fdata->sched_core[lcore_id])
-                       printf("[%s()] lcore %d executing scheduler\n",
-                                       __func__, lcore_id);
-
-               if (fdata->worker_core[lcore_id])
-                       printf(
-                               "[%s()] lcore %d executing worker, using 
eventdev port %u\n",
-                               __func__, lcore_id,
-                               worker_data[worker_idx].port_id);
+               dump_core_info(lcore_id, worker_data, worker_idx);
 
                err = rte_eal_remote_launch(fdata->cap.worker,
                                &worker_data[worker_idx], lcore_id);
@@ -444,8 +452,13 @@ main(int argc, char **argv)
 
        lcore_id = rte_lcore_id();
 
-       if (core_in_use(lcore_id))
-               fdata->cap.worker(&worker_data[worker_idx++]);
+       if (core_in_use(lcore_id)) {
+               dump_core_info(lcore_id, worker_data, worker_idx);
+               fdata->cap.worker(&worker_data[worker_idx]);
+
+               if (fdata->worker_core[lcore_id])
+                       worker_idx++;
+       }
 
        rte_eal_mp_wait_lcore();
 
-- 
2.25.1

Reply via email to