[v4,09/27] examples/ip_pipeline: replace references to master_lcore

Message ID 20200701202359.17006-10-stephen@networkplumber.org (mailing list archive)
State Superseded, archived
Delegated to: Thomas Monjalon
Headers
Series Replace references to master and slave |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation fail Compilation issues

Commit Message

Stephen Hemminger July 1, 2020, 8:23 p.m. UTC
Use initial lcore instead of primary lcore

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
 examples/ip_pipeline/main.c   |  2 +-
 examples/ip_pipeline/thread.c | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)
  

Comments

Burakov, Anatoly July 13, 2020, 1:01 p.m. UTC | #1
On 01-Jul-20 9:23 PM, Stephen Hemminger wrote:
> Use initial lcore instead of primary lcore
> 
> Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
> ---

Acked-by: Anatoly Burakov <anatoly.burakov@intel.com>
  
Cristian Dumitrescu Sept. 10, 2020, 9:52 a.m. UTC | #2
> -----Original Message-----
> From: dev <dev-bounces@dpdk.org> On Behalf Of Burakov, Anatoly
> Sent: Monday, July 13, 2020 2:01 PM
> To: Stephen Hemminger <stephen@networkplumber.org>; dev@dpdk.org
> Subject: Re: [dpdk-dev] [PATCH v4 09/27] examples/ip_pipeline: replace
> references to master_lcore
> 
> On 01-Jul-20 9:23 PM, Stephen Hemminger wrote:
> > Use initial lcore instead of primary lcore
> >
> > Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
> > ---
> 
> Acked-by: Anatoly Burakov <anatoly.burakov@intel.com>
> 
> --
> Thanks,
> Anatoly

Hi Stephen,

Sorry for the late feedback, may I suggest for this particular application replacing Master thread with Control thread rather than Initial thread, thanks!

Regards,
Cristian
  

Patch

diff --git a/examples/ip_pipeline/main.c b/examples/ip_pipeline/main.c
index 97d1e91c2b4b..060c6311ddc6 100644
--- a/examples/ip_pipeline/main.c
+++ b/examples/ip_pipeline/main.c
@@ -250,7 +250,7 @@  main(int argc, char **argv)
 	rte_eal_mp_remote_launch(
 		thread_main,
 		NULL,
-		SKIP_MASTER);
+		SKIP_INITIAL);
 
 	/* Script */
 	if (app.script_name)
diff --git a/examples/ip_pipeline/thread.c b/examples/ip_pipeline/thread.c
index adb83167cd84..feefdca4eba2 100644
--- a/examples/ip_pipeline/thread.c
+++ b/examples/ip_pipeline/thread.c
@@ -32,7 +32,7 @@ 
 #endif
 
 /**
- * Master thead: data plane thread context
+ * Initial thread: data plane thread context
  */
 struct thread {
 	struct rte_ring *msgq_req;
@@ -78,7 +78,7 @@  struct thread_data {
 static struct thread_data thread_data[RTE_MAX_LCORE];
 
 /**
- * Master thread: data plane thread init
+ * Initial thread: data plane thread init
  */
 static void
 thread_free(void)
@@ -105,7 +105,7 @@  thread_init(void)
 {
 	uint32_t i;
 
-	RTE_LCORE_FOREACH_SLAVE(i) {
+	RTE_LCORE_FOREACH_WORKER(i) {
 		char name[NAME_MAX];
 		struct rte_ring *msgq_req, *msgq_rsp;
 		struct thread *t = &thread[i];
@@ -137,7 +137,7 @@  thread_init(void)
 			return -1;
 		}
 
-		/* Master thread records */
+		/* Initial thread records */
 		t->msgq_req = msgq_req;
 		t->msgq_rsp = msgq_rsp;
 		t->enabled = 1;
@@ -179,7 +179,7 @@  pipeline_is_running(struct pipeline *p)
 }
 
 /**
- * Master thread & data plane threads: message passing
+ * Initial thread & data plane threads: message passing
  */
 enum thread_req_type {
 	THREAD_REQ_PIPELINE_ENABLE = 0,
@@ -213,7 +213,7 @@  struct thread_msg_rsp {
 };
 
 /**
- * Master thread
+ * Initial thread
  */
 static struct thread_msg_req *
 thread_msg_alloc(void)
@@ -556,7 +556,7 @@  thread_msg_handle(struct thread_data *t)
 }
 
 /**
- * Master thread & data plane threads: message passing
+ * Initial thread & data plane threads: message passing
  */
 enum pipeline_req_type {
 	/* Port IN */
@@ -730,7 +730,7 @@  struct pipeline_msg_rsp {
 };
 
 /**
- * Master thread
+ * Initial thread
  */
 static struct pipeline_msg_req *
 pipeline_msg_alloc(void)