Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/80588/?format=api
{ "id": 80588, "url": "https://patches.dpdk.org/api/patches/80588/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20201013152610.2589-13-stephen@networkplumber.org/", "project": { "id": 1, "url": "https://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20201013152610.2589-13-stephen@networkplumber.org>", "list_archive_url": "https://inbox.dpdk.org/dev/20201013152610.2589-13-stephen@networkplumber.org", "date": "2020-10-13T15:26:04", "name": "[v5,12/18] examples: replace use of master with main", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "b7262597e7cbbd319d7a292522a03dfafd3ef68a", "submitter": { "id": 27, "url": "https://patches.dpdk.org/api/people/27/?format=api", "name": "Stephen Hemminger", "email": "stephen@networkplumber.org" }, "delegate": { "id": 1, "url": "https://patches.dpdk.org/api/users/1/?format=api", "username": "tmonjalo", "first_name": "Thomas", "last_name": "Monjalon", "email": "thomas@monjalon.net" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/20201013152610.2589-13-stephen@networkplumber.org/mbox/", "series": [ { "id": 12924, "url": "https://patches.dpdk.org/api/series/12924/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=12924", "date": "2020-10-13T15:25:52", "name": "Replace terms master/slave", "version": 5, "mbox": "https://patches.dpdk.org/series/12924/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/80588/comments/", "check": "warning", "checks": "https://patches.dpdk.org/api/patches/80588/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@inbox.dpdk.org", "Delivered-To": "patchwork@inbox.dpdk.org", "Received": [ "from dpdk.org (dpdk.org [92.243.14.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 0FF95A04B7;\n\tTue, 13 Oct 2020 17:31:39 +0200 (CEST)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id EC5E11DD71;\n\tTue, 13 Oct 2020 17:27:33 +0200 (CEST)", "from mail-pl1-f194.google.com (mail-pl1-f194.google.com\n [209.85.214.194]) by dpdk.org (Postfix) with ESMTP id 6027C1DD70\n for <dev@dpdk.org>; Tue, 13 Oct 2020 17:27:31 +0200 (CEST)", "by mail-pl1-f194.google.com with SMTP id 1so12231ple.2\n for <dev@dpdk.org>; Tue, 13 Oct 2020 08:27:31 -0700 (PDT)", "from hermes.local (204-195-22-127.wavecable.com. [204.195.22.127])\n by smtp.gmail.com with ESMTPSA id z12sm23815233pfr.197.2020.10.13.08.27.24\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Tue, 13 Oct 2020 08:27:26 -0700 (PDT)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=networkplumber-org.20150623.gappssmtp.com; s=20150623;\n h=from:to:cc:subject:date:message-id:in-reply-to:references\n :mime-version:content-transfer-encoding;\n bh=IxvHsy+OougTJFwzCkxWod84iCmxmanpNKygJkHarLs=;\n b=Im/Ct5WtbLV+CWSFg5pHpvgwu7hcLjDbpRFlOVHNPDmhrQd85jZEKRbB9xemjG73US\n uh5SXqqA4cGkA6cThadSG6zEgk6/NmQeiXjdpXjq56kh5kSt8TpNtH+p2gUGk4dIZ/nL\n oXVhUqEOphDsy4p9xQEwqfTF3QVGUmWCH5ksM+KC06125dosnnpSMPpW4wF9BDz988pk\n X7/my5QRliNi3A6aDqybd1Ecx1v8JD/cN8FAqHfbvjhnDtIXB4T/00K70IhEYC1ijA+B\n dp6VYBnNmFXKU+UitKy5JBAdPCgMZ2T+UYliSMUzO8fX4guSkOYTdHJqehyQ4bB8J+2t\n BTbw==", "X-Google-DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20161025;\n h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\n :references:mime-version:content-transfer-encoding;\n bh=IxvHsy+OougTJFwzCkxWod84iCmxmanpNKygJkHarLs=;\n b=ExrhB6qSgCSm14cEKPA0wM3WEbZGsUMmRF47ruhOrt+6mv/Kq3+NZZu1c7IYWfTSmY\n HUN6g0Z5M5uSNx93M5Tb/zuUJVZxdG4BqR7YSBZb82Qfe2p6kn6AJY9CtHlX92bUS2jf\n wdSFSKXLjkqXsw77sMYGhgLP4RGNGjAMKssdYcYu1T5h1gGGFsbc41Dq7l67HufhtDZ8\n yxejV9rAWgwwqiBKwcBbVZ0VGV9SHnQjHElIi/xtfaLCA14Arv0SrXnReM2n/KiJJOBo\n k1omt9H1EdChFtAYh8TQBvrZKVR1MNep9WTWgI5O/m001kdkyce9wXKAVb3BgoHENlX0\n OaIA==", "X-Gm-Message-State": "AOAM531W08UpJ9GwHxFphq4KUj2Lh4ohQRqLTfVqagq0+onaDmFwhQjp\n K6B0yCRQh4m8mvwUA8KOtLYScWqbMY0fSbmQ", "X-Google-Smtp-Source": "\n ABdhPJwRivZORYwPeDzCg7ATX5C0HM1Z/4fb1GO0TtTH/Rr+Q/X7Aw7UsV3rxXBT8tAtOs6cLOPI4Q==", "X-Received": "by 2002:a17:90a:cb86:: with SMTP id\n a6mr224983pju.161.1602602848749;\n Tue, 13 Oct 2020 08:27:28 -0700 (PDT)", "From": "Stephen Hemminger <stephen@networkplumber.org>", "To": "dev@dpdk.org", "Cc": "Stephen Hemminger <stephen@networkplumber.org>,\n Anatoly Burakov <anatoly.burakov@intel.com>,\n Reshma Pattan <reshma.pattan@intel.com>,\n Cristian Dumitrescu <cristian.dumitrescu@intel.com>,\n Tomasz Kantecki <tomasz.kantecki@intel.com>,\n Declan Doherty <declan.doherty@intel.com>,\n Sunil Kumar Kori <skori@marvell.com>,\n Pavan Nikhilesh <pbhagavatula@marvell.com>,\n Bruce Richardson <bruce.richardson@intel.com>,\n Konstantin Ananyev <konstantin.ananyev@intel.com>,\n Jerin Jacob <jerinj@marvell.com>, Kiran Kumar K <kirankumark@marvell.com>,\n Nithin Dabilpuram <ndabilpuram@marvell.com>,\n David Hunt <david.hunt@intel.com>", "Date": "Tue, 13 Oct 2020 08:26:04 -0700", "Message-Id": "<20201013152610.2589-13-stephen@networkplumber.org>", "X-Mailer": "git-send-email 2.27.0", "In-Reply-To": "<20201013152610.2589-1-stephen@networkplumber.org>", "References": "<20200914182002.6750-1-stephen@networkplumber.org>\n <20201013152610.2589-1-stephen@networkplumber.org>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "Subject": "[dpdk-dev] [PATCH v5 12/18] examples: replace use of master with\n\tmain", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "Change references to master/slave lcore to main/worker.\nFor l2fwd, l3fwd and link_status examples.\n\nAcked-by: Anatoly Burakov <anatoly.burakov@intel.com>\nSigned-off-by: Stephen Hemminger <stephen@networkplumber.org>\n---\n app/pdump/main.c | 2 +-\n examples/ip_pipeline/thread.c | 14 +++++++-------\n examples/l2fwd-cat/l2fwd-cat.c | 2 +-\n examples/l2fwd-crypto/main.c | 6 +++---\n examples/l2fwd-event/l2fwd_event_generic.c | 2 +-\n examples/l2fwd-event/l2fwd_event_internal_port.c | 2 +-\n examples/l2fwd-event/l2fwd_poll.c | 2 +-\n examples/l2fwd-event/main.c | 2 +-\n examples/l2fwd-jobstats/main.c | 2 +-\n examples/l2fwd-keepalive/main.c | 2 +-\n examples/l2fwd/main.c | 6 +++---\n examples/l3fwd-acl/main.c | 2 +-\n examples/l3fwd-graph/main.c | 14 +++++++-------\n examples/l3fwd-power/main.c | 16 ++++++++--------\n examples/l3fwd/main.c | 2 +-\n examples/link_status_interrupt/main.c | 6 +++---\n 16 files changed, 41 insertions(+), 41 deletions(-)", "diff": "diff --git a/app/pdump/main.c b/app/pdump/main.c\nindex c38c53719e7d..b34bf335317b 100644\n--- a/app/pdump/main.c\n+++ b/app/pdump/main.c\n@@ -947,7 +947,7 @@ dump_packets(void)\n \t\t\trte_exit(EXIT_FAILURE, \"failed to wait\\n\");\n \t}\n \n-\t/* master core */\n+\t/* main core */\n \twhile (!quit_signal)\n \t\t;\n }\ndiff --git a/examples/ip_pipeline/thread.c b/examples/ip_pipeline/thread.c\nindex adb83167cd84..46006f9d0265 100644\n--- a/examples/ip_pipeline/thread.c\n+++ b/examples/ip_pipeline/thread.c\n@@ -32,7 +32,7 @@\n #endif\n \n /**\n- * Master thead: data plane thread context\n+ * Main thead: data plane thread context\n */\n struct thread {\n \tstruct rte_ring *msgq_req;\n@@ -78,7 +78,7 @@ struct thread_data {\n static struct thread_data thread_data[RTE_MAX_LCORE];\n \n /**\n- * Master thread: data plane thread init\n+ * Main thread: data plane thread init\n */\n static void\n thread_free(void)\n@@ -137,7 +137,7 @@ thread_init(void)\n \t\t\treturn -1;\n \t\t}\n \n-\t\t/* Master thread records */\n+\t\t/* Main thread records */\n \t\tt->msgq_req = msgq_req;\n \t\tt->msgq_rsp = msgq_rsp;\n \t\tt->enabled = 1;\n@@ -179,7 +179,7 @@ pipeline_is_running(struct pipeline *p)\n }\n \n /**\n- * Master thread & data plane threads: message passing\n+ * Main thread & data plane threads: message passing\n */\n enum thread_req_type {\n \tTHREAD_REQ_PIPELINE_ENABLE = 0,\n@@ -213,7 +213,7 @@ struct thread_msg_rsp {\n };\n \n /**\n- * Master thread\n+ * Main thread\n */\n static struct thread_msg_req *\n thread_msg_alloc(void)\n@@ -556,7 +556,7 @@ thread_msg_handle(struct thread_data *t)\n }\n \n /**\n- * Master thread & data plane threads: message passing\n+ * Main thread & data plane threads: message passing\n */\n enum pipeline_req_type {\n \t/* Port IN */\n@@ -730,7 +730,7 @@ struct pipeline_msg_rsp {\n };\n \n /**\n- * Master thread\n+ * Main thread\n */\n static struct pipeline_msg_req *\n pipeline_msg_alloc(void)\ndiff --git a/examples/l2fwd-cat/l2fwd-cat.c b/examples/l2fwd-cat/l2fwd-cat.c\nindex 45a497c082da..2e632c5cb6a5 100644\n--- a/examples/l2fwd-cat/l2fwd-cat.c\n+++ b/examples/l2fwd-cat/l2fwd-cat.c\n@@ -198,7 +198,7 @@ main(int argc, char *argv[])\n \tif (rte_lcore_count() > 1)\n \t\tprintf(\"\\nWARNING: Too many lcores enabled. Only 1 used.\\n\");\n \n-\t/* Call lcore_main on the master core only. */\n+\t/* Call lcore_main on the main core only. */\n \tlcore_main();\n \n \treturn 0;\ndiff --git a/examples/l2fwd-crypto/main.c b/examples/l2fwd-crypto/main.c\nindex 820470db50cb..67e3403cfe89 100644\n--- a/examples/l2fwd-crypto/main.c\n+++ b/examples/l2fwd-crypto/main.c\n@@ -874,8 +874,8 @@ l2fwd_main_loop(struct l2fwd_crypto_options *options)\n \t\t\t\tif (unlikely(timer_tsc >=\n \t\t\t\t\t\t(uint64_t)timer_period)) {\n \n-\t\t\t\t\t/* do this only on master core */\n-\t\t\t\t\tif (lcore_id == rte_get_master_lcore()\n+\t\t\t\t\t/* do this only on main core */\n+\t\t\t\t\tif (lcore_id == rte_get_main_lcore()\n \t\t\t\t\t\t&& options->refresh_period) {\n \t\t\t\t\t\tprint_stats();\n \t\t\t\t\t\ttimer_tsc = 0;\n@@ -2799,7 +2799,7 @@ main(int argc, char **argv)\n \n \t/* launch per-lcore init on every lcore */\n \trte_eal_mp_remote_launch(l2fwd_launch_one_lcore, (void *)&options,\n-\t\t\tCALL_MASTER);\n+\t\t\tCALL_MAIN);\n \tRTE_LCORE_FOREACH_SLAVE(lcore_id) {\n \t\tif (rte_eal_wait_lcore(lcore_id) < 0)\n \t\t\treturn -1;\ndiff --git a/examples/l2fwd-event/l2fwd_event_generic.c b/examples/l2fwd-event/l2fwd_event_generic.c\nindex 2dc95e5f7d1a..fda52680d8a0 100644\n--- a/examples/l2fwd-event/l2fwd_event_generic.c\n+++ b/examples/l2fwd-event/l2fwd_event_generic.c\n@@ -72,7 +72,7 @@ l2fwd_event_device_setup_generic(struct l2fwd_resources *rsrc)\n \t\tevent_d_conf.nb_event_port_enqueue_depth =\n \t\t\t\tdev_info.max_event_port_enqueue_depth;\n \n-\t/* Ignore Master core and service cores. */\n+\t/* Ignore Main core and service cores. */\n \tnum_workers = rte_lcore_count() - 1 - rte_service_lcore_count();\n \tif (dev_info.max_event_ports < num_workers)\n \t\tnum_workers = dev_info.max_event_ports;\ndiff --git a/examples/l2fwd-event/l2fwd_event_internal_port.c b/examples/l2fwd-event/l2fwd_event_internal_port.c\nindex 63d57b46c2da..84ed1c41158f 100644\n--- a/examples/l2fwd-event/l2fwd_event_internal_port.c\n+++ b/examples/l2fwd-event/l2fwd_event_internal_port.c\n@@ -71,7 +71,7 @@ l2fwd_event_device_setup_internal_port(struct l2fwd_resources *rsrc)\n \t\tevent_d_conf.nb_event_port_enqueue_depth =\n \t\t\t\tdev_info.max_event_port_enqueue_depth;\n \n-\t/* Ignore Master core. */\n+\t/* Ignore Main core. */\n \tnum_workers = rte_lcore_count() - 1;\n \tif (dev_info.max_event_ports < num_workers)\n \t\tnum_workers = dev_info.max_event_ports;\ndiff --git a/examples/l2fwd-event/l2fwd_poll.c b/examples/l2fwd-event/l2fwd_poll.c\nindex 2033c65e54b1..f7d8945a129b 100644\n--- a/examples/l2fwd-event/l2fwd_poll.c\n+++ b/examples/l2fwd-event/l2fwd_poll.c\n@@ -116,7 +116,7 @@ l2fwd_poll_lcore_config(struct l2fwd_resources *rsrc)\n \n \t\t/* get the lcore_id for this port */\n \t\twhile (rte_lcore_is_enabled(rx_lcore_id) == 0 ||\n-\t\t rx_lcore_id == rte_get_master_lcore() ||\n+\t\t rx_lcore_id == rte_get_main_lcore() ||\n \t\t poll_rsrc->lcore_queue_conf[rx_lcore_id].n_rx_port ==\n \t\t rsrc->rx_queue_per_lcore) {\n \t\t\trx_lcore_id++;\ndiff --git a/examples/l2fwd-event/main.c b/examples/l2fwd-event/main.c\nindex 9f831b126696..1a2788a730ec 100644\n--- a/examples/l2fwd-event/main.c\n+++ b/examples/l2fwd-event/main.c\n@@ -667,7 +667,7 @@ main(int argc, char **argv)\n \n \t/* launch per-lcore init on every lcore */\n \trte_eal_mp_remote_launch(l2fwd_launch_one_lcore, rsrc,\n-\t\t\t\t SKIP_MASTER);\n+\t\t\t\t SKIP_MAIN);\n \tl2fwd_event_print_stats(rsrc);\n \tif (rsrc->event_mode) {\n \t\tstruct l2fwd_event_resources *evt_rsrc =\ndiff --git a/examples/l2fwd-jobstats/main.c b/examples/l2fwd-jobstats/main.c\nindex 1dbe06622dad..bb55b0c19353 100644\n--- a/examples/l2fwd-jobstats/main.c\n+++ b/examples/l2fwd-jobstats/main.c\n@@ -1016,7 +1016,7 @@ main(int argc, char **argv)\n \t\tRTE_LOG(INFO, L2FWD, \"Stats display disabled\\n\");\n \n \t/* launch per-lcore init on every lcore */\n-\trte_eal_mp_remote_launch(l2fwd_launch_one_lcore, NULL, CALL_MASTER);\n+\trte_eal_mp_remote_launch(l2fwd_launch_one_lcore, NULL, CALL_MAIN);\n \tRTE_LCORE_FOREACH_SLAVE(lcore_id) {\n \t\tif (rte_eal_wait_lcore(lcore_id) < 0)\n \t\t\treturn -1;\ndiff --git a/examples/l2fwd-keepalive/main.c b/examples/l2fwd-keepalive/main.c\nindex d0e8bf3cceb1..5df7a085cb52 100644\n--- a/examples/l2fwd-keepalive/main.c\n+++ b/examples/l2fwd-keepalive/main.c\n@@ -786,7 +786,7 @@ main(int argc, char **argv)\n \t\t\t\t) != 0 )\n \t\t\trte_exit(EXIT_FAILURE, \"Stats setup failure.\\n\");\n \t}\n-\t/* launch per-lcore init on every slave lcore */\n+\t/* launch per-lcore init on every worker lcore */\n \tRTE_LCORE_FOREACH_SLAVE(lcore_id) {\n \t\tstruct lcore_queue_conf *qconf = &lcore_queue_conf[lcore_id];\n \ndiff --git a/examples/l2fwd/main.c b/examples/l2fwd/main.c\nindex 7e3078788e84..307b6315e0d7 100644\n--- a/examples/l2fwd/main.c\n+++ b/examples/l2fwd/main.c\n@@ -260,8 +260,8 @@ l2fwd_main_loop(void)\n \t\t\t\t/* if timer has reached its timeout */\n \t\t\t\tif (unlikely(timer_tsc >= timer_period)) {\n \n-\t\t\t\t\t/* do this only on master core */\n-\t\t\t\t\tif (lcore_id == rte_get_master_lcore()) {\n+\t\t\t\t\t/* do this only on main core */\n+\t\t\t\t\tif (lcore_id == rte_get_main_lcore()) {\n \t\t\t\t\t\tprint_stats();\n \t\t\t\t\t\t/* reset the timer */\n \t\t\t\t\t\ttimer_tsc = 0;\n@@ -884,7 +884,7 @@ main(int argc, char **argv)\n \n \tret = 0;\n \t/* launch per-lcore init on every lcore */\n-\trte_eal_mp_remote_launch(l2fwd_launch_one_lcore, NULL, CALL_MASTER);\n+\trte_eal_mp_remote_launch(l2fwd_launch_one_lcore, NULL, CALL_MAIN);\n \tRTE_LCORE_FOREACH_SLAVE(lcore_id) {\n \t\tif (rte_eal_wait_lcore(lcore_id) < 0) {\n \t\t\tret = -1;\ndiff --git a/examples/l3fwd-acl/main.c b/examples/l3fwd-acl/main.c\nindex 4386584667bb..cae050458c94 100644\n--- a/examples/l3fwd-acl/main.c\n+++ b/examples/l3fwd-acl/main.c\n@@ -2104,7 +2104,7 @@ main(int argc, char **argv)\n \tcheck_all_ports_link_status(enabled_port_mask);\n \n \t/* launch per-lcore init on every lcore */\n-\trte_eal_mp_remote_launch(main_loop, NULL, CALL_MASTER);\n+\trte_eal_mp_remote_launch(main_loop, NULL, CALL_MAIN);\n \tRTE_LCORE_FOREACH_SLAVE(lcore_id) {\n \t\tif (rte_eal_wait_lcore(lcore_id) < 0)\n \t\t\treturn -1;\ndiff --git a/examples/l3fwd-graph/main.c b/examples/l3fwd-graph/main.c\nindex 2306ba9b07cb..ba7496560c26 100644\n--- a/examples/l3fwd-graph/main.c\n+++ b/examples/l3fwd-graph/main.c\n@@ -167,8 +167,8 @@ check_lcore_params(void)\n \t\t\treturn -1;\n \t\t}\n \n-\t\tif (lcore == rte_get_master_lcore()) {\n-\t\t\tprintf(\"Error: lcore %u is master lcore\\n\", lcore);\n+\t\tif (lcore == rte_get_main_lcore()) {\n+\t\t\tprintf(\"Error: lcore %u is main lcore\\n\", lcore);\n \t\t\treturn -1;\n \t\t}\n \t\tsocketid = rte_lcore_to_socket_id(lcore);\n@@ -1091,16 +1091,16 @@ main(int argc, char **argv)\n \t\t\troute_str, i);\n \t}\n \n-\t/* Launch per-lcore init on every slave lcore */\n-\trte_eal_mp_remote_launch(graph_main_loop, NULL, SKIP_MASTER);\n+\t/* Launch per-lcore init on every worker lcore */\n+\trte_eal_mp_remote_launch(graph_main_loop, NULL, SKIP_MAIN);\n \n-\t/* Accumulate and print stats on master until exit */\n+\t/* Accumulate and print stats on main until exit */\n \tif (rte_graph_has_stats_feature())\n \t\tprint_stats();\n \n-\t/* Wait for slave cores to exit */\n+\t/* Wait for worker cores to exit */\n \tret = 0;\n-\tRTE_LCORE_FOREACH_SLAVE(lcore_id) {\n+\tRTE_LCORE_FOREACH_WORKER(lcore_id) {\n \t\tret = rte_eal_wait_lcore(lcore_id);\n \t\t/* Destroy graph */\n \t\tif (ret < 0 || rte_graph_destroy(\ndiff --git a/examples/l3fwd-power/main.c b/examples/l3fwd-power/main.c\nindex d0e6c9bd77b9..61363e8a6357 100644\n--- a/examples/l3fwd-power/main.c\n+++ b/examples/l3fwd-power/main.c\n@@ -1514,7 +1514,7 @@ check_lcore_params(void)\n \t\t\t\t\t\t\"off\\n\", lcore, socketid);\n \t\t}\n \t\tif (app_mode == APP_MODE_TELEMETRY && lcore == rte_lcore_id()) {\n-\t\t\tprintf(\"cannot enable master core %d in config for telemetry mode\\n\",\n+\t\t\tprintf(\"cannot enable main core %d in config for telemetry mode\\n\",\n \t\t\t\trte_lcore_id());\n \t\t\treturn -1;\n \t\t}\n@@ -2375,10 +2375,10 @@ launch_timer(unsigned int lcore_id)\n \tRTE_SET_USED(lcore_id);\n \n \n-\tif (rte_get_master_lcore() != lcore_id) {\n-\t\trte_panic(\"timer on lcore:%d which is not master core:%d\\n\",\n+\tif (rte_get_main_lcore() != lcore_id) {\n+\t\trte_panic(\"timer on lcore:%d which is not main core:%d\\n\",\n \t\t\t\tlcore_id,\n-\t\t\t\trte_get_master_lcore());\n+\t\t\t\trte_get_main_lcore());\n \t}\n \n \tRTE_LOG(INFO, POWER, \"Bring up the Timer\\n\");\n@@ -2759,11 +2759,11 @@ main(int argc, char **argv)\n \n \t/* launch per-lcore init on every lcore */\n \tif (app_mode == APP_MODE_LEGACY) {\n-\t\trte_eal_mp_remote_launch(main_legacy_loop, NULL, CALL_MASTER);\n+\t\trte_eal_mp_remote_launch(main_legacy_loop, NULL, CALL_MAIN);\n \t} else if (app_mode == APP_MODE_EMPTY_POLL) {\n \t\tempty_poll_stop = false;\n \t\trte_eal_mp_remote_launch(main_empty_poll_loop, NULL,\n-\t\t\t\tSKIP_MASTER);\n+\t\t\t\tSKIP_MAIN);\n \t} else if (app_mode == APP_MODE_TELEMETRY) {\n \t\tunsigned int i;\n \n@@ -2787,9 +2787,9 @@ main(int argc, char **argv)\n \t\t\t\thandle_app_stats,\n \t\t\t\t\"Returns global power stats. Parameters: None\");\n \t\trte_eal_mp_remote_launch(main_telemetry_loop, NULL,\n-\t\t\t\t\t\tSKIP_MASTER);\n+\t\t\t\t\t\tSKIP_MAIN);\n \t} else if (app_mode == APP_MODE_INTERRUPT) {\n-\t\trte_eal_mp_remote_launch(main_intr_loop, NULL, CALL_MASTER);\n+\t\trte_eal_mp_remote_launch(main_intr_loop, NULL, CALL_MAIN);\n \t}\n \n \tif (app_mode == APP_MODE_EMPTY_POLL || app_mode == APP_MODE_TELEMETRY)\ndiff --git a/examples/l3fwd/main.c b/examples/l3fwd/main.c\nindex 80f3434ec2da..51378a5dab8c 100644\n--- a/examples/l3fwd/main.c\n+++ b/examples/l3fwd/main.c\n@@ -1272,7 +1272,7 @@ main(int argc, char **argv)\n \n \tret = 0;\n \t/* launch per-lcore init on every lcore */\n-\trte_eal_mp_remote_launch(l3fwd_lkp.main_loop, NULL, CALL_MASTER);\n+\trte_eal_mp_remote_launch(l3fwd_lkp.main_loop, NULL, CALL_MAIN);\n \tif (evt_rsrc->enabled) {\n \t\tfor (i = 0; i < evt_rsrc->rx_adptr.nb_rx_adptr; i++)\n \t\t\trte_event_eth_rx_adapter_stop(\ndiff --git a/examples/link_status_interrupt/main.c b/examples/link_status_interrupt/main.c\nindex e20a7e2a31f8..69b0ad376667 100644\n--- a/examples/link_status_interrupt/main.c\n+++ b/examples/link_status_interrupt/main.c\n@@ -255,8 +255,8 @@ lsi_main_loop(void)\n \t\t\t\t/* if timer has reached its timeout */\n \t\t\t\tif (unlikely(timer_tsc >= (uint64_t) timer_period)) {\n \n-\t\t\t\t\t/* do this only on master core */\n-\t\t\t\t\tif (lcore_id == rte_get_master_lcore()) {\n+\t\t\t\t\t/* do this only on main core */\n+\t\t\t\t\tif (lcore_id == rte_get_main_lcore()) {\n \t\t\t\t\t\tprint_stats();\n \t\t\t\t\t\t/* reset the timer */\n \t\t\t\t\t\ttimer_tsc = 0;\n@@ -725,7 +725,7 @@ main(int argc, char **argv)\n \tcheck_all_ports_link_status(nb_ports, lsi_enabled_port_mask);\n \n \t/* launch per-lcore init on every lcore */\n-\trte_eal_mp_remote_launch(lsi_launch_one_lcore, NULL, CALL_MASTER);\n+\trte_eal_mp_remote_launch(lsi_launch_one_lcore, NULL, CALL_MAIN);\n \tRTE_LCORE_FOREACH_SLAVE(lcore_id) {\n \t\tif (rte_eal_wait_lcore(lcore_id) < 0)\n \t\t\treturn -1;\n", "prefixes": [ "v5", "12/18" ] }