[dpdk-dev] [PATCH v7 14/20] examples/performance-thread: replace reference to master lcore

[Stephen Hemminger]

Replace term master with main here.

Acked-by: Anatoly Burakov <anatoly.bura...@intel.com>
Signed-off-by: Stephen Hemminger <step...@networkplumber.org>
---
 examples/performance-thread/l3fwd-thread/main.c | 16 ++++++++--------
 examples/performance-thread/pthread_shim/main.c |  4 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/examples/performance-thread/l3fwd-thread/main.c 
b/examples/performance-thread/l3fwd-thread/main.c
index 818e483d2faa..e96076f2903e 100644
--- a/examples/performance-thread/l3fwd-thread/main.c
+++ b/examples/performance-thread/l3fwd-thread/main.c
@@ -2211,7 +2211,7 @@ lthread_rx(void *dummy)
 /*
  * Start scheduler with initial lthread on lcore
  *
- * This lthread loop spawns all rx and tx lthreads on master lcore
+ * This lthread loop spawns all rx and tx lthreads on main lcore
  */
 
 static void *
@@ -2261,11 +2261,11 @@ lthread_spawner(__rte_unused void *arg)
 }
 
 /*
- * Start master scheduler with initial lthread spawning rx and tx lthreads
- * (main_lthread_master).
+ * Start main scheduler with initial lthread spawning rx and tx lthreads
+ * (main_lthread_main).
  */
 static int
-lthread_master_spawner(__rte_unused void *arg) {
+lthread_main_spawner(__rte_unused void *arg) {
        struct lthread *lt;
        int lcore_id = rte_lcore_id();
 
@@ -3759,14 +3759,14 @@ main(int argc, char **argv)
 #endif
 
                lthread_num_schedulers_set(nb_lcores);
-               rte_eal_mp_remote_launch(sched_spawner, NULL, SKIP_MASTER);
-               lthread_master_spawner(NULL);
+               rte_eal_mp_remote_launch(sched_spawner, NULL, SKIP_MAIN);
+               lthread_main_spawner(NULL);
 
        } else {
                printf("Starting P-Threading Model\n");
                /* launch per-lcore init on every lcore */
-               rte_eal_mp_remote_launch(pthread_run, NULL, CALL_MASTER);
-               RTE_LCORE_FOREACH_SLAVE(lcore_id) {
+               rte_eal_mp_remote_launch(pthread_run, NULL, CALL_MAIN);
+               RTE_LCORE_FOREACH_WORKER(lcore_id) {
                        if (rte_eal_wait_lcore(lcore_id) < 0)
                                return -1;
                }
diff --git a/examples/performance-thread/pthread_shim/main.c 
b/examples/performance-thread/pthread_shim/main.c
index 18f83059bc17..23e3b5e311cd 100644
--- a/examples/performance-thread/pthread_shim/main.c
+++ b/examples/performance-thread/pthread_shim/main.c
@@ -252,10 +252,10 @@ int main(int argc, char **argv)
        lthread_num_schedulers_set(num_sched);
 
        /* launch all threads */
-       rte_eal_mp_remote_launch(lthread_scheduler, (void *)NULL, CALL_MASTER);
+       rte_eal_mp_remote_launch(lthread_scheduler, (void *)NULL, CALL_MAIN);
 
        /* wait for threads to stop */
-       RTE_LCORE_FOREACH_SLAVE(lcore_id) {
+       RTE_LCORE_FOREACH_WORKER(lcore_id) {
                rte_eal_wait_lcore(lcore_id);
        }
        return 0;
-- 
2.27.0