Use main instead of master in the QoS examples.
Replace the "mst" command line argument with "mnc"
Acked-by: Anatoly Burakov <anatoly.bura...@intel.com>
Signed-off-by: Stephen Hemminger <step...@networkplumber.org>
---
examples/qos_meter/main.c | 4 ++--
examples/qos_sched/args.c | 26 +++++++++++++-------------
examples/qos_sched/cmdline.c | 2 +-
examples/qos_sched/main.c | 2 +-
4 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/examples/qos_meter/main.c b/examples/qos_meter/main.c
index ce87b2eca262..f2d9c28828ab 100644
--- a/examples/qos_meter/main.c
+++ b/examples/qos_meter/main.c
@@ -454,8 +454,8 @@ main(int argc, char **argv)
rte_exit(EXIT_FAILURE, "Invalid configure flow table\n");
/* Launch per-lcore init on every lcore */
- rte_eal_mp_remote_launch(main_loop, NULL, CALL_MASTER);
- RTE_LCORE_FOREACH_SLAVE(lcore_id) {
+ rte_eal_mp_remote_launch(main_loop, NULL, CALL_MAIN);
+ RTE_LCORE_FOREACH_WORKER(lcore_id) {
if (rte_eal_wait_lcore(lcore_id) < 0)
return -1;
}
diff --git a/examples/qos_sched/args.c b/examples/qos_sched/args.c
index 7431b29816aa..c627196230b6 100644
--- a/examples/qos_sched/args.c
+++ b/examples/qos_sched/args.c
@@ -22,7 +22,7 @@
#define MAX_OPT_VALUES 8
#define SYS_CPU_DIR "/sys/devices/system/cpu/cpu%u/topology/"
-static uint32_t app_master_core = 1;
+static uint32_t app_main_core = 1;
static uint32_t app_numa_mask;
static uint64_t app_used_core_mask = 0;
static uint64_t app_used_port_mask = 0;
@@ -40,7 +40,7 @@ static const char usage[] =
"
\n"
"Application optional parameters:
\n"
" --i : run in interactive mode (default value is %u)
\n"
- " --mst I : master core index (default value is %u)
\n"
+ " --mnc I : main core index (default value is %u)
\n"
" --rsz \"A, B, C\" : Ring sizes
\n"
" A = Size (in number of buffer descriptors) of each of the
NIC RX \n"
" rings read by the I/O RX lcores (default value is %u)
\n"
@@ -72,7 +72,7 @@ static const char usage[] =
static void
app_usage(const char *prgname)
{
- printf(usage, prgname, APP_INTERACTIVE_DEFAULT, app_master_core,
+ printf(usage, prgname, APP_INTERACTIVE_DEFAULT, app_main_core,
APP_RX_DESC_DEFAULT, APP_RING_SIZE, APP_TX_DESC_DEFAULT,
MAX_PKT_RX_BURST, PKT_ENQUEUE, PKT_DEQUEUE,
MAX_PKT_TX_BURST, NB_MBUF,
@@ -98,7 +98,7 @@ app_eal_core_mask(void)
cm |= (1ULL << i);
}
- cm |= (1ULL << rte_get_master_lcore());
+ cm |= (1ULL << rte_get_main_lcore());
return cm;
}
@@ -312,7 +312,7 @@ app_parse_args(int argc, char **argv)
static struct option lgopts[] = {
{ "pfc", 1, 0, 0 },
- { "mst", 1, 0, 0 },
+ { "mnc", 1, 0, 0 },
{ "rsz", 1, 0, 0 },
{ "bsz", 1, 0, 0 },
{ "msz", 1, 0, 0 },
@@ -352,8 +352,8 @@ app_parse_args(int argc, char **argv)
}
break;
}
- if (str_is(optname, "mst")) {
- app_master_core =
(uint32_t)atoi(optarg);
+ if (str_is(optname, "mnc")) {
+ app_main_core = (uint32_t)atoi(optarg);
break;
}
if (str_is(optname, "rsz")) {
@@ -408,18 +408,18 @@ app_parse_args(int argc, char **argv)
}
}
- /* check master core index validity */
- for(i = 0; i <= app_master_core; i++) {
- if (app_used_core_mask & (1u << app_master_core)) {
- RTE_LOG(ERR, APP, "Master core index is not configured
properly\n");
+ /* check main core index validity */
+ for (i = 0; i <= app_main_core; i++) {
+ if (app_used_core_mask & (1u << app_main_core)) {
+ RTE_LOG(ERR, APP, "Main core index is not configured
properly\n");
app_usage(prgname);
return -1;
}
}
- app_used_core_mask |= 1u << app_master_core;
+ app_used_core_mask |= 1u << app_main_core;
if ((app_used_core_mask != app_eal_core_mask()) ||
- (app_master_core != rte_get_master_lcore())) {
+ (app_main_core != rte_get_main_lcore())) {
RTE_LOG(ERR, APP, "EAL core mask not configured properly, must
be %" PRIx64
" instead of %" PRIx64 "\n" ,
app_used_core_mask, app_eal_core_mask());
return -1;
diff --git a/examples/qos_sched/cmdline.c b/examples/qos_sched/cmdline.c
index ba68e0d02693..1cf7ea97abbf 100644
--- a/examples/qos_sched/cmdline.c
+++ b/examples/qos_sched/cmdline.c
@@ -599,7 +599,7 @@ cmdline_parse_ctx_t main_ctx[] = {
NULL,
};
-/* prompt function, called from main on MASTER lcore */
+/* prompt function, called from main on MAIN lcore */
void
prompt(void)
{
diff --git a/examples/qos_sched/main.c b/examples/qos_sched/main.c
index 73864d66dbc8..a6071b991c76 100644
--- a/examples/qos_sched/main.c
+++ b/examples/qos_sched/main.c
@@ -204,7 +204,7 @@ main(int argc, char **argv)
return -1;
/* launch per-lcore init on every lcore */
- rte_eal_mp_remote_launch(app_main_loop, NULL, SKIP_MASTER);
+ rte_eal_mp_remote_launch(app_main_loop, NULL, SKIP_MAIN);
if (interactive) {
sleep(1);
--
2.27.0
