[14/15] examples/ipsec-secgw: replace master lcore with main lcore

Message ID 20200911190701.29171-15-stephen@networkplumber.org (mailing list archive)
State Superseded, archived
Headers
Series Replace terms master/slave lcore with main/worker lcore |

Checks

Context Check Description
ci/checkpatch warning coding style issues

Commit Message

Stephen Hemminger Sept. 11, 2020, 7:07 p.m. UTC
  Simple replacement.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
 examples/ipsec-secgw/event_helper.c | 6 +++---
 examples/ipsec-secgw/ipsec-secgw.c  | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
  

Comments

Burakov, Anatoly Sept. 14, 2020, 3:19 p.m. UTC | #1
On 11-Sep-20 8:07 PM, Stephen Hemminger wrote:
> Simple replacement.
> 
> Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
> ---

Acked-by: Anatoly Burakov <anatoly.burakov@intel.com>

With below fix

> diff --git a/examples/ipsec-secgw/ipsec-secgw.c b/examples/ipsec-secgw/ipsec-secgw.c
> index 8ba15d23c7e8..49d8a93a12cc 100644
> --- a/examples/ipsec-secgw/ipsec-secgw.c
> +++ b/examples/ipsec-secgw/ipsec-secgw.c
> @@ -2992,7 +2992,7 @@ main(int32_t argc, char **argv)
>   #endif /* STATS_INTERVAL */
>   
>   	/* launch per-lcore init on every lcore */
> -	rte_eal_mp_remote_launch(ipsec_launch_one_lcore, eh_conf, CALL_MASTER);
> +	rte_eal_mp_remote_launch(ipsec_launch_one_lcore, eh_conf, CALL_MAIN);
>   	RTE_LCORE_FOREACH_SLAVE(lcore_id) {

Missed updating the macro.

>   		if (rte_eal_wait_lcore(lcore_id) < 0)
>   			return -1;
>
  

Patch

diff --git a/examples/ipsec-secgw/event_helper.c b/examples/ipsec-secgw/event_helper.c
index 865dc911b864..bd60f0359b59 100644
--- a/examples/ipsec-secgw/event_helper.c
+++ b/examples/ipsec-secgw/event_helper.c
@@ -1461,16 +1461,16 @@  eh_conf_init(void)
 
 	/* Set two cores as eth cores for Rx & Tx */
 
-	/* Use first core other than master core as Rx core */
+	/* Use first core other than main core as Rx core */
 	eth_core_id = rte_get_next_lcore(0,	/* curr core */
-					 1,	/* skip master core */
+					 1,	/* skip main core */
 					 0	/* wrap */);
 
 	rte_bitmap_set(em_conf->eth_core_mask, eth_core_id);
 
 	/* Use next core as Tx core */
 	eth_core_id = rte_get_next_lcore(eth_core_id,	/* curr core */
-					 1,		/* skip master core */
+					 1,		/* skip main core */
 					 0		/* wrap */);
 
 	rte_bitmap_set(em_conf->eth_core_mask, eth_core_id);
diff --git a/examples/ipsec-secgw/ipsec-secgw.c b/examples/ipsec-secgw/ipsec-secgw.c
index 8ba15d23c7e8..49d8a93a12cc 100644
--- a/examples/ipsec-secgw/ipsec-secgw.c
+++ b/examples/ipsec-secgw/ipsec-secgw.c
@@ -2992,7 +2992,7 @@  main(int32_t argc, char **argv)
 #endif /* STATS_INTERVAL */
 
 	/* launch per-lcore init on every lcore */
-	rte_eal_mp_remote_launch(ipsec_launch_one_lcore, eh_conf, CALL_MASTER);
+	rte_eal_mp_remote_launch(ipsec_launch_one_lcore, eh_conf, CALL_MAIN);
 	RTE_LCORE_FOREACH_SLAVE(lcore_id) {
 		if (rte_eal_wait_lcore(lcore_id) < 0)
 			return -1;