Patch Detail

HTTP 200 OK
Allow: GET, PUT, PATCH, HEAD, OPTIONS
Content-Type: application/json
Vary: Accept

{
    "id": 77753,
    "url": "http://patches.dpdk.org/api/patches/77753/?format=api",
    "web_url": "http://patches.dpdk.org/project/dpdk/patch/20200915151114.12024-18-stephen@networkplumber.org/",
    "project": {
        "id": 1,
        "url": "http://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": "<20200915151114.12024-18-stephen@networkplumber.org>",
    "list_archive_url": "https://inbox.dpdk.org/dev/20200915151114.12024-18-stephen@networkplumber.org",
    "date": "2020-09-15T15:11:14",
    "name": "[v3,17/17] examples: replace master lcore with main lcore",
    "commit_ref": null,
    "pull_url": null,
    "state": "superseded",
    "archived": true,
    "hash": "76b6164231e87ca56f759e242516b0a283283a4e",
    "submitter": {
        "id": 27,
        "url": "http://patches.dpdk.org/api/people/27/?format=api",
        "name": "Stephen Hemminger",
        "email": "stephen@networkplumber.org"
    },
    "delegate": {
        "id": 1,
        "url": "http://patches.dpdk.org/api/users/1/?format=api",
        "username": "tmonjalo",
        "first_name": "Thomas",
        "last_name": "Monjalon",
        "email": "thomas@monjalon.net"
    },
    "mbox": "http://patches.dpdk.org/project/dpdk/patch/20200915151114.12024-18-stephen@networkplumber.org/mbox/",
    "series": [
        {
            "id": 12238,
            "url": "http://patches.dpdk.org/api/series/12238/?format=api",
            "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=12238",
            "date": "2020-09-15T15:11:09",
            "name": "Replace terms master/slave",
            "version": 3,
            "mbox": "http://patches.dpdk.org/series/12238/mbox/"
        }
    ],
    "comments": "http://patches.dpdk.org/api/patches/77753/comments/",
    "check": "warning",
    "checks": "http://patches.dpdk.org/api/patches/77753/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 20756A04C7;\n\tTue, 15 Sep 2020 17:21:28 +0200 (CEST)",
            "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id AC1D81C192;\n\tTue, 15 Sep 2020 17:19:56 +0200 (CEST)",
            "from mail-il1-f194.google.com (mail-il1-f194.google.com\n [209.85.166.194]) by dpdk.org (Postfix) with ESMTP id 063D91C10B\n for <dev@dpdk.org>; Tue, 15 Sep 2020 17:19:55 +0200 (CEST)",
            "by mail-il1-f194.google.com with SMTP id u18so3307448iln.13\n for <dev@dpdk.org>; Tue, 15 Sep 2020 08:19:54 -0700 (PDT)",
            "from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127])\n by smtp.gmail.com with ESMTPSA id c127sm13742278pfa.165.2020.09.15.08.11.49\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Tue, 15 Sep 2020 08:11:50 -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=jLB9fABnnKL0TkFyrVZDRCV1pER4tjkSJwaYhp9TK3U=;\n b=YA1PLkh29UjVuDPFWiua48W+RvqZ+j4ETIqlQ4h6N4cxZpBJPGgoUB6avzVkzboe1w\n 59TVYraB1/M0tOUbc9lny0WyFiaCaZeQfQhmJxNKx595ueryPXYLoQYOQfdGvYpFdHwM\n 8NpD2o4gb3JArZoTCeIEoZXVQGzR1wZuaAxrCCY8Ps0ToKa4QCUuRQtgBJq0jHo3YeQr\n augl2tnQdFhRPW3E4NrJLI0xezSdp8NrUsQmTgPbdGK2lCIaSZ7q3wy41WnTt18YcTaV\n /CR6PDmh8SMvJFnr+Iva08d/453kkiFHb86KKKdP4LK5UYyLqOLPIoMA/q9wxAGYHdtg\n 1+aw==",
        "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=jLB9fABnnKL0TkFyrVZDRCV1pER4tjkSJwaYhp9TK3U=;\n b=snfSL/iAkJlE1g3s37uC/cdv++vHMwECEnKz++4MS7aguudj+hQzt15a8/eRWS53wA\n LSRBSzp50F25oEVvfW8IuopBSw90qkIBiieMA5TryZSWYRLF7s8/K7AwA2dvXMJsNH0P\n Cmqp4wEuZN1MzzMGP2OVh7KJZcpoZYJCLWh18D9vQLeuNNCEhWR9/RtZLoeT1yG4OomQ\n V2S4CjN+K4MjfuIH8KCe2Uyr3aYGJH2W4iqFdtHKti4wLsitON3A4Bfprn2Ivz4JgG/Z\n nxcU1ffEwwiILYxHPhkrxu9l8NC72kece6f4mKS0tkxv/C8+5aZ9Hv3sp021pF0z95C9\n anZQ==",
        "X-Gm-Message-State": "AOAM530EC39rlnT50CD7D8zH3unz7g19koNTMuL4fRNxnOvc/b7MZDkY\n LSi8lSMMZiwqt5wK6INaJ5gPuinOxo0iOQ==",
        "X-Google-Smtp-Source": "\n ABdhPJztXTqQ4ztqyXP7DXrHg2h7dYet7tpvLMe5GqSNFyqIVuVlAWfsul/bMPlvgqnj9WbsiMQyUA==",
        "X-Received": "by 2002:a63:6d4c:: with SMTP id i73mr15608440pgc.63.1600182711345;\n Tue, 15 Sep 2020 08:11:51 -0700 (PDT)",
        "From": "Stephen Hemminger <stephen@networkplumber.org>",
        "To": "dev@dpdk.org",
        "Cc": "Stephen Hemminger <stephen@networkplumber.org>",
        "Date": "Tue, 15 Sep 2020 08:11:14 -0700",
        "Message-Id": "<20200915151114.12024-18-stephen@networkplumber.org>",
        "X-Mailer": "git-send-email 2.27.0",
        "In-Reply-To": "<20200915151114.12024-1-stephen@networkplumber.org>",
        "References": "<20200911190701.29171-1-stephen@networkplumber.org>\n <20200915151114.12024-1-stephen@networkplumber.org>",
        "MIME-Version": "1.0",
        "Content-Transfer-Encoding": "8bit",
        "Subject": "[dpdk-dev] [PATCH v3 17/17] examples: replace master lcore with\n\tmain lcore",
        "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": "Replace use of the term master lcore with main lcore in\nthe example programs.\n\nSigned-off-by: Stephen Hemminger <stephen@networkplumber.org>\n---\n examples/bbdev_app/main.c               | 14 +++++------\n examples/bond/main.c                    | 32 ++++++++++++-------------\n examples/distributor/main.c             | 10 ++++----\n examples/ethtool/ethtool-app/main.c     | 11 +++++----\n examples/eventdev_pipeline/main.c       |  2 +-\n examples/flow_classify/flow_classify.c  |  2 +-\n examples/helloworld/main.c              |  6 ++---\n examples/ioat/ioatfwd.c                 |  6 ++---\n examples/ip_fragmentation/main.c        |  4 ++--\n examples/ip_pipeline/main.c             |  2 +-\n examples/ip_pipeline/thread.c           |  2 +-\n examples/ip_reassembly/main.c           |  4 ++--\n examples/ipv4_multicast/main.c          |  4 ++--\n examples/kni/main.c                     |  6 ++---\n examples/l2fwd-crypto/main.c            |  2 +-\n examples/l2fwd-jobstats/main.c          |  2 +-\n examples/l2fwd-keepalive/main.c         |  4 ++--\n examples/l2fwd/main.c                   |  2 +-\n examples/l3fwd-acl/main.c               |  2 +-\n examples/l3fwd-power/main.c             |  6 ++---\n examples/link_status_interrupt/main.c   |  2 +-\n examples/multi_process/simple_mp/main.c |  2 +-\n examples/ntb/ntb_fwd.c                  | 14 +++++------\n examples/packet_ordering/main.c         | 22 ++++++++---------\n examples/ptpclient/ptpclient.c          |  4 ++--\n examples/rxtx_callbacks/main.c          |  2 +-\n examples/server_node_efd/server/main.c  | 10 ++++----\n examples/skeleton/basicfwd.c            |  2 +-\n examples/tep_termination/main.c         | 12 +++++-----\n examples/timer/main.c                   |  8 +++----\n examples/vhost/main.c                   | 10 ++++----\n examples/vmdq/main.c                    |  4 ++--\n examples/vmdq_dcb/main.c                |  6 ++---\n 33 files changed, 111 insertions(+), 110 deletions(-)",
    "diff": "diff --git a/examples/bbdev_app/main.c b/examples/bbdev_app/main.c\nindex 68a46050c048..8bbb41dd3fb4 100644\n--- a/examples/bbdev_app/main.c\n+++ b/examples/bbdev_app/main.c\n@@ -1042,7 +1042,7 @@ main(int argc, char **argv)\n \tstruct stats_lcore_params stats_lcore;\n \tstruct rte_ring *enc_to_dec_ring;\n \tbool stats_thread_started = false;\n-\tunsigned int master_lcore_id = rte_get_master_lcore();\n+\tunsigned int main_lcore_id = rte_get_main_lcore();\n \n \trte_atomic16_init(&global_exit_flag);\n \n@@ -1145,9 +1145,9 @@ main(int argc, char **argv)\n \tstats_lcore.app_params = &app_params;\n \tstats_lcore.lconf = lcore_conf;\n \n-\tRTE_LCORE_FOREACH_SLAVE(lcore_id) {\n+\tRTE_LCORE_FOREACH_WORKER(lcore_id) {\n \t\tif (lcore_conf[lcore_id].core_type != 0)\n-\t\t\t/* launch per-lcore processing loop on slave lcores */\n+\t\t\t/* launch per-lcore processing loop on worker lcores */\n \t\t\trte_eal_remote_launch(processing_loop,\n \t\t\t\t\t&lcore_conf[lcore_id], lcore_id);\n \t\telse if (!stats_thread_started) {\n@@ -1159,15 +1159,15 @@ main(int argc, char **argv)\n \t}\n \n \tif (!stats_thread_started &&\n-\t\t\tlcore_conf[master_lcore_id].core_type != 0)\n+\t\t\tlcore_conf[main_lcore_id].core_type != 0)\n \t\trte_exit(EXIT_FAILURE,\n \t\t\t\t\"Not enough lcores to run the statistics printing loop!\");\n-\telse if (lcore_conf[master_lcore_id].core_type != 0)\n-\t\tprocessing_loop(&lcore_conf[master_lcore_id]);\n+\telse if (lcore_conf[main_lcore_id].core_type != 0)\n+\t\tprocessing_loop(&lcore_conf[main_lcore_id]);\n \telse if (!stats_thread_started)\n \t\tstats_loop(&stats_lcore);\n \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}\n \ndiff --git a/examples/bond/main.c b/examples/bond/main.c\nindex 8608285b686e..398553b7853f 100644\n--- a/examples/bond/main.c\n+++ b/examples/bond/main.c\n@@ -573,7 +573,7 @@ static void cmd_start_parsed(__rte_unused void *parsed_result,\n \t\t\t       struct cmdline *cl,\n \t\t\t       __rte_unused void *data)\n {\n-\tint slave_core_id = rte_lcore_id();\n+\tint worker_core_id = rte_lcore_id();\n \n \trte_spinlock_trylock(&global_flag_stru_p->lock);\n \tif (global_flag_stru_p->LcoreMainIsRunning == 0) {\n@@ -590,9 +590,9 @@ static void cmd_start_parsed(__rte_unused void *parsed_result,\n \t\treturn;\n \t}\n \n-\t/* start lcore main on core != master_core - ARP response thread */\n-\tslave_core_id = rte_get_next_lcore(rte_lcore_id(), 1, 0);\n-\tif ((slave_core_id >= RTE_MAX_LCORE) || (slave_core_id == 0))\n+\t/* start lcore main on core != main_core - ARP response thread */\n+\tworker_core_id = rte_get_next_lcore(rte_lcore_id(), 1, 0);\n+\tif ((worker_core_id >= RTE_MAX_LCORE) || (worker_core_id == 0))\n \t\treturn;\n \n \trte_spinlock_trylock(&global_flag_stru_p->lock);\n@@ -601,8 +601,8 @@ static void cmd_start_parsed(__rte_unused void *parsed_result,\n \tcmdline_printf(cl,\n \t\t\t\"Starting lcore_main on core %d:%d \"\n \t\t\t\"Our IP:%d.%d.%d.%d\\n\",\n-\t\t\tslave_core_id,\n-\t\t\trte_eal_remote_launch(lcore_main, NULL, slave_core_id),\n+\t\t\tworker_core_id,\n+\t\t\trte_eal_remote_launch(lcore_main, NULL, worker_core_id),\n \t\t\tBOND_IP_1,\n \t\t\tBOND_IP_2,\n \t\t\tBOND_IP_3,\n@@ -802,7 +802,7 @@ cmdline_parse_ctx_t main_ctx[] = {\n \tNULL,\n };\n \n-/* prompt function, called from main on MASTER lcore */\n+/* prompt function, called from main on MAIN lcore */\n static void prompt(__rte_unused void *arg1)\n {\n \tstruct cmdline *cl;\n@@ -818,7 +818,7 @@ static void prompt(__rte_unused void *arg1)\n int\n main(int argc, char *argv[])\n {\n-\tint ret, slave_core_id;\n+\tint ret, worker_core_id;\n \tuint16_t nb_ports, i;\n \n \t/* init EAL */\n@@ -852,23 +852,23 @@ main(int argc, char *argv[])\n \trte_spinlock_init(&global_flag_stru_p->lock);\n \n \t/* check state of lcores */\n-\tRTE_LCORE_FOREACH_SLAVE(slave_core_id) {\n-\t\tif (rte_eal_get_lcore_state(slave_core_id) != WAIT)\n+\tRTE_LCORE_FOREACH_WORKER(worker_core_id) {\n+\t\tif (rte_eal_get_lcore_state(worker_core_id) != WAIT)\n \t\t\treturn -EBUSY;\n \t}\n \n-\t/* start lcore main on core != master_core - ARP response thread */\n-\tslave_core_id = rte_get_next_lcore(rte_lcore_id(), 1, 0);\n-\tif ((slave_core_id >= RTE_MAX_LCORE) || (slave_core_id == 0))\n+\t/* start lcore main on core != main_core - ARP response thread */\n+\tworker_core_id = rte_get_next_lcore(rte_lcore_id(), 1, 0);\n+\tif ((worker_core_id >= RTE_MAX_LCORE) || (worker_core_id == 0))\n \t\treturn -EPERM;\n \n \tglobal_flag_stru_p->LcoreMainIsRunning = 1;\n-\tglobal_flag_stru_p->LcoreMainCore = slave_core_id;\n+\tglobal_flag_stru_p->LcoreMainCore = worker_core_id;\n \tprintf(\"Starting lcore_main on core %d:%d Our IP:%d.%d.%d.%d\\n\",\n-\t\t\tslave_core_id,\n+\t\t\tworker_core_id,\n \t\t\trte_eal_remote_launch((lcore_function_t *)lcore_main,\n \t\t\t\t\tNULL,\n-\t\t\t\t\tslave_core_id),\n+\t\t\t\t\tworker_core_id),\n \t\t\tBOND_IP_1,\n \t\t\tBOND_IP_2,\n \t\t\tBOND_IP_3,\ndiff --git a/examples/distributor/main.c b/examples/distributor/main.c\nindex dca48c2abd7d..caa7c46cb1e8 100644\n--- a/examples/distributor/main.c\n+++ b/examples/distributor/main.c\n@@ -612,7 +612,7 @@ static int\n init_power_library(void)\n {\n \tint ret = 0, lcore_id;\n-\tRTE_LCORE_FOREACH_SLAVE(lcore_id) {\n+\tRTE_LCORE_FOREACH_WORKER(lcore_id) {\n \t\t/* init power management library */\n \t\tret = rte_power_init(lcore_id);\n \t\tif (ret) {\n@@ -805,7 +805,7 @@ main(int argc, char *argv[])\n \t\t * available, the higher frequency cores will go to the\n \t\t * distributor first, then rx, then tx.\n \t\t */\n-\t\tRTE_LCORE_FOREACH_SLAVE(lcore_id) {\n+\t\tRTE_LCORE_FOREACH_WORKER(lcore_id) {\n \n \t\t\trte_power_get_capabilities(lcore_id, &lcore_cap);\n \n@@ -838,7 +838,7 @@ main(int argc, char *argv[])\n \t * after the high performing core assignment above, pre-assign\n \t * them here.\n \t */\n-\tRTE_LCORE_FOREACH_SLAVE(lcore_id) {\n+\tRTE_LCORE_FOREACH_WORKER(lcore_id) {\n \t\tif (lcore_id == (unsigned int)distr_core_id ||\n \t\t\t\tlcore_id == (unsigned int)rx_core_id ||\n \t\t\t\tlcore_id == (unsigned int)tx_core_id)\n@@ -869,7 +869,7 @@ main(int argc, char *argv[])\n \t * Kick off all the worker threads first, avoiding the pre-assigned\n \t * lcore_ids for tx, rx and distributor workloads.\n \t */\n-\tRTE_LCORE_FOREACH_SLAVE(lcore_id) {\n+\tRTE_LCORE_FOREACH_WORKER(lcore_id) {\n \t\tif (lcore_id == (unsigned int)distr_core_id ||\n \t\t\t\tlcore_id == (unsigned int)rx_core_id ||\n \t\t\t\tlcore_id == (unsigned int)tx_core_id)\n@@ -922,7 +922,7 @@ main(int argc, char *argv[])\n \t\tusleep(1000);\n \t}\n \n-\tRTE_LCORE_FOREACH_SLAVE(lcore_id) {\n+\tRTE_LCORE_FOREACH_WORKER(lcore_id) {\n \t\tif (rte_eal_wait_lcore(lcore_id) < 0)\n \t\t\treturn -1;\n \t}\ndiff --git a/examples/ethtool/ethtool-app/main.c b/examples/ethtool/ethtool-app/main.c\nindex 7383413215d6..c6023a1d41bd 100644\n--- a/examples/ethtool/ethtool-app/main.c\n+++ b/examples/ethtool/ethtool-app/main.c\n@@ -176,7 +176,7 @@ static void process_frame(struct app_port *ptr_port,\n \trte_ether_addr_copy(&ptr_port->mac_addr, &ptr_mac_hdr->s_addr);\n }\n \n-static int slave_main(__rte_unused void *ptr_data)\n+static int worker_main(__rte_unused void *ptr_data)\n {\n \tstruct app_port *ptr_port;\n \tstruct rte_mbuf *ptr_frame;\n@@ -284,16 +284,17 @@ int main(int argc, char **argv)\n \tapp_cfg.cnt_ports = cnt_ports;\n \n \tif (rte_lcore_count() < 2)\n-\t\trte_exit(EXIT_FAILURE, \"No available slave core!\\n\");\n-\t/* Assume there is an available slave.. */\n+\t\trte_exit(EXIT_FAILURE, \"No available worker core!\\n\");\n+\n+\t/* Assume there is an available worker.. */\n \tid_core = rte_lcore_id();\n \tid_core = rte_get_next_lcore(id_core, 1, 1);\n-\trte_eal_remote_launch(slave_main, NULL, id_core);\n+\trte_eal_remote_launch(worker_main, NULL, id_core);\n \n \tethapp_main();\n \n \tapp_cfg.exit_now = 1;\n-\tRTE_LCORE_FOREACH_SLAVE(id_core) {\n+\tRTE_LCORE_FOREACH_WORKER(id_core) {\n \t\tif (rte_eal_wait_lcore(id_core) < 0)\n \t\t\treturn -1;\n \t}\ndiff --git a/examples/eventdev_pipeline/main.c b/examples/eventdev_pipeline/main.c\nindex 4ac5821539f4..08edc6782e16 100644\n--- a/examples/eventdev_pipeline/main.c\n+++ b/examples/eventdev_pipeline/main.c\n@@ -395,7 +395,7 @@ main(int argc, char **argv)\n \t}\n \n \tint worker_idx = 0;\n-\tRTE_LCORE_FOREACH_SLAVE(lcore_id) {\n+\tRTE_LCORE_FOREACH_WORKER(lcore_id) {\n \t\tif (lcore_id >= MAX_NUM_CORE)\n \t\t\tbreak;\n \ndiff --git a/examples/flow_classify/flow_classify.c b/examples/flow_classify/flow_classify.c\nindex 433e64d3f901..335d7d2ad815 100644\n--- a/examples/flow_classify/flow_classify.c\n+++ b/examples/flow_classify/flow_classify.c\n@@ -850,7 +850,7 @@ main(int argc, char *argv[])\n \t\trte_exit(EXIT_FAILURE, \"Failed to add rules\\n\");\n \t}\n \n-\t/* Call lcore_main on the master core only. */\n+\t/* Call lcore_main on the main core only. */\n \tlcore_main(cls_app);\n \n \treturn 0;\ndiff --git a/examples/helloworld/main.c b/examples/helloworld/main.c\nindex 968045f1b042..8a4cee60ff07 100644\n--- a/examples/helloworld/main.c\n+++ b/examples/helloworld/main.c\n@@ -34,12 +34,12 @@ main(int argc, char **argv)\n \tif (ret < 0)\n \t\trte_panic(\"Cannot init EAL\\n\");\n \n-\t/* call lcore_hello() on every slave lcore */\n-\tRTE_LCORE_FOREACH_SLAVE(lcore_id) {\n+\t/* call lcore_hello() on every worker lcore */\n+\tRTE_LCORE_FOREACH_WORKER(lcore_id) {\n \t\trte_eal_remote_launch(lcore_hello, NULL, lcore_id);\n \t}\n \n-\t/* call it on master lcore too */\n+\t/* call it on main lcore too */\n \tlcore_hello(NULL);\n \n \trte_eal_mp_wait_lcore();\ndiff --git a/examples/ioat/ioatfwd.c b/examples/ioat/ioatfwd.c\nindex 43a19843ee6b..34dd519818b0 100644\n--- a/examples/ioat/ioatfwd.c\n+++ b/examples/ioat/ioatfwd.c\n@@ -520,7 +520,7 @@ tx_main_loop(void)\n \t\t\tioat_tx_port(&cfg.ports[i]);\n }\n \n-/* Main rx and tx loop if only one slave lcore available */\n+/* Main rx and tx loop if only one worker lcore available */\n static void\n rxtx_main_loop(void)\n {\n@@ -984,7 +984,7 @@ main(int argc, char **argv)\n \tcfg.nb_lcores = rte_lcore_count() - 1;\n \tif (cfg.nb_lcores < 1)\n \t\trte_exit(EXIT_FAILURE,\n-\t\t\t\"There should be at least one slave lcore.\\n\");\n+\t\t\t\"There should be at least one worker lcore.\\n\");\n \n \tif (copy_mode == COPY_MODE_IOAT_NUM)\n \t\tassign_rawdevs();\n@@ -992,7 +992,7 @@ main(int argc, char **argv)\n \t\tassign_rings();\n \n \tstart_forwarding_cores();\n-\t/* master core prints stats while other cores forward */\n+\t/* main core prints stats while other cores forward */\n \tprint_stats(argv[0]);\n \n \t/* force_quit is true when we get here */\ndiff --git a/examples/ip_fragmentation/main.c b/examples/ip_fragmentation/main.c\nindex 4afb97109fed..fdba37cea013 100644\n--- a/examples/ip_fragmentation/main.c\n+++ b/examples/ip_fragmentation/main.c\n@@ -1072,8 +1072,8 @@ 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_LCORE_FOREACH_SLAVE(lcore_id) {\n+\trte_eal_mp_remote_launch(main_loop, NULL, CALL_MAIN);\n+\tRTE_LCORE_FOREACH_WORKER(lcore_id) {\n \t\tif (rte_eal_wait_lcore(lcore_id) < 0)\n \t\t\treturn -1;\n \t}\ndiff --git a/examples/ip_pipeline/main.c b/examples/ip_pipeline/main.c\nindex 97d1e91c2b4b..c4aba394314a 100644\n--- a/examples/ip_pipeline/main.c\n+++ b/examples/ip_pipeline/main.c\n@@ -250,7 +250,7 @@ main(int argc, char **argv)\n \trte_eal_mp_remote_launch(\n \t\tthread_main,\n \t\tNULL,\n-\t\tSKIP_MASTER);\n+\t\tSKIP_MAIN);\n \n \t/* Script */\n \tif (app.script_name)\ndiff --git a/examples/ip_pipeline/thread.c b/examples/ip_pipeline/thread.c\nindex 46006f9d0265..df1045ee7a70 100644\n--- a/examples/ip_pipeline/thread.c\n+++ b/examples/ip_pipeline/thread.c\n@@ -105,7 +105,7 @@ thread_init(void)\n {\n \tuint32_t i;\n \n-\tRTE_LCORE_FOREACH_SLAVE(i) {\n+\tRTE_LCORE_FOREACH_WORKER(i) {\n \t\tchar name[NAME_MAX];\n \t\tstruct rte_ring *msgq_req, *msgq_rsp;\n \t\tstruct thread *t = &thread[i];\ndiff --git a/examples/ip_reassembly/main.c b/examples/ip_reassembly/main.c\nindex 550fb53becf3..23470cb8aedc 100644\n--- a/examples/ip_reassembly/main.c\n+++ b/examples/ip_reassembly/main.c\n@@ -1198,8 +1198,8 @@ main(int argc, char **argv)\n \tsignal(SIGINT, signal_handler);\n \n \t/* launch per-lcore init on every lcore */\n-\trte_eal_mp_remote_launch(main_loop, NULL, CALL_MASTER);\n-\tRTE_LCORE_FOREACH_SLAVE(lcore_id) {\n+\trte_eal_mp_remote_launch(main_loop, NULL, CALL_MAIN);\n+\tRTE_LCORE_FOREACH_WORKER(lcore_id) {\n \t\tif (rte_eal_wait_lcore(lcore_id) < 0)\n \t\t\treturn -1;\n \t}\ndiff --git a/examples/ipv4_multicast/main.c b/examples/ipv4_multicast/main.c\nindex 7e255c35a301..10b5ef27ef57 100644\n--- a/examples/ipv4_multicast/main.c\n+++ b/examples/ipv4_multicast/main.c\n@@ -801,8 +801,8 @@ main(int argc, char **argv)\n \t\trte_exit(EXIT_FAILURE, \"Cannot build the multicast hash\\n\");\n \n \t/* launch per-lcore init on every lcore */\n-\trte_eal_mp_remote_launch(main_loop, NULL, CALL_MASTER);\n-\tRTE_LCORE_FOREACH_SLAVE(lcore_id) {\n+\trte_eal_mp_remote_launch(main_loop, NULL, CALL_MAIN);\n+\tRTE_LCORE_FOREACH_WORKER(lcore_id) {\n \t\tif (rte_eal_wait_lcore(lcore_id) < 0)\n \t\t\treturn -1;\n \t}\ndiff --git a/examples/kni/main.c b/examples/kni/main.c\nindex f5d12a5b8676..6b7449b7039b 100644\n--- a/examples/kni/main.c\n+++ b/examples/kni/main.c\n@@ -956,7 +956,7 @@ kni_alloc(uint16_t port_id)\n \t\tconf.mbuf_size = MAX_PACKET_SZ;\n \t\t/*\n \t\t * The first KNI device associated to a port\n-\t\t * is the master, for multiple kernel thread\n+\t\t * is the main, for multiple kernel thread\n \t\t * environment.\n \t\t */\n \t\tif (i == 0) {\n@@ -1105,8 +1105,8 @@ main(int argc, char** argv)\n \t\t\t\"Could not create link status thread!\\n\");\n \n \t/* Launch per-lcore function on every lcore */\n-\trte_eal_mp_remote_launch(main_loop, NULL, CALL_MASTER);\n-\tRTE_LCORE_FOREACH_SLAVE(i) {\n+\trte_eal_mp_remote_launch(main_loop, NULL, CALL_MAIN);\n+\tRTE_LCORE_FOREACH_WORKER(i) {\n \t\tif (rte_eal_wait_lcore(i) < 0)\n \t\t\treturn -1;\n \t}\ndiff --git a/examples/l2fwd-crypto/main.c b/examples/l2fwd-crypto/main.c\nindex 8b14a153d838..693fd554fdbc 100644\n--- a/examples/l2fwd-crypto/main.c\n+++ b/examples/l2fwd-crypto/main.c\n@@ -2803,7 +2803,7 @@ main(int argc, char **argv)\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_MAIN);\n-\tRTE_LCORE_FOREACH_SLAVE(lcore_id) {\n+\tRTE_LCORE_FOREACH_WORKER(lcore_id) {\n \t\tif (rte_eal_wait_lcore(lcore_id) < 0)\n \t\t\treturn -1;\n \t}\ndiff --git a/examples/l2fwd-jobstats/main.c b/examples/l2fwd-jobstats/main.c\nindex 08ffd27bc4d8..4e682bb8d558 100644\n--- a/examples/l2fwd-jobstats/main.c\n+++ b/examples/l2fwd-jobstats/main.c\n@@ -1020,7 +1020,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, NULL, CALL_MAIN);\n-\tRTE_LCORE_FOREACH_SLAVE(lcore_id) {\n+\tRTE_LCORE_FOREACH_WORKER(lcore_id) {\n \t\tif (rte_eal_wait_lcore(lcore_id) < 0)\n \t\t\treturn -1;\n \t}\ndiff --git a/examples/l2fwd-keepalive/main.c b/examples/l2fwd-keepalive/main.c\nindex 468fe6afdef4..ca2cc1c62a22 100644\n--- a/examples/l2fwd-keepalive/main.c\n+++ b/examples/l2fwd-keepalive/main.c\n@@ -790,7 +790,7 @@ main(int argc, char **argv)\n \t\t\trte_exit(EXIT_FAILURE, \"Stats setup failure.\\n\");\n \t}\n \t/* launch per-lcore init on every worker lcore */\n-\tRTE_LCORE_FOREACH_SLAVE(lcore_id) {\n+\tRTE_LCORE_FOREACH_WORKER(lcore_id) {\n \t\tstruct lcore_queue_conf *qconf = &lcore_queue_conf[lcore_id];\n \n \t\tif (qconf->n_rx_port == 0)\n@@ -813,7 +813,7 @@ main(int argc, char **argv)\n \t\trte_delay_ms(5);\n \t\t}\n \n-\tRTE_LCORE_FOREACH_SLAVE(lcore_id) {\n+\tRTE_LCORE_FOREACH_WORKER(lcore_id) {\n \t\tif (rte_eal_wait_lcore(lcore_id) < 0)\n \t\t\treturn -1;\n \t}\ndiff --git a/examples/l2fwd/main.c b/examples/l2fwd/main.c\nindex d5ec1201ba63..1ee95ad8a9fb 100644\n--- a/examples/l2fwd/main.c\n+++ b/examples/l2fwd/main.c\n@@ -888,7 +888,7 @@ main(int argc, char **argv)\n \tret = 0;\n \t/* launch per-lcore init on every lcore */\n \trte_eal_mp_remote_launch(l2fwd_launch_one_lcore, NULL, CALL_MAIN);\n-\tRTE_LCORE_FOREACH_SLAVE(lcore_id) {\n+\tRTE_LCORE_FOREACH_WORKER(lcore_id) {\n \t\tif (rte_eal_wait_lcore(lcore_id) < 0) {\n \t\t\tret = -1;\n \t\t\tbreak;\ndiff --git a/examples/l3fwd-acl/main.c b/examples/l3fwd-acl/main.c\nindex f9f4542b3371..56e7dcbcfd58 100644\n--- a/examples/l3fwd-acl/main.c\n+++ b/examples/l3fwd-acl/main.c\n@@ -2108,7 +2108,7 @@ main(int argc, char **argv)\n \n \t/* launch per-lcore init on every lcore */\n \trte_eal_mp_remote_launch(main_loop, NULL, CALL_MAIN);\n-\tRTE_LCORE_FOREACH_SLAVE(lcore_id) {\n+\tRTE_LCORE_FOREACH_WORKER(lcore_id) {\n \t\tif (rte_eal_wait_lcore(lcore_id) < 0)\n \t\t\treturn -1;\n \t}\ndiff --git a/examples/l3fwd-power/main.c b/examples/l3fwd-power/main.c\nindex 00a551d8ace1..6c64c5037232 100644\n--- a/examples/l3fwd-power/main.c\n+++ b/examples/l3fwd-power/main.c\n@@ -2287,7 +2287,7 @@ get_current_stat_values(uint64_t *values)\n \tuint64_t app_eps = 0, app_fps = 0, app_br = 0;\n \tuint64_t count = 0;\n \n-\tRTE_LCORE_FOREACH_SLAVE(lcore_id) {\n+\tRTE_LCORE_FOREACH_WORKER(lcore_id) {\n \t\tqconf = &lcore_conf[lcore_id];\n \t\tif (qconf->n_rx_queue == 0)\n \t\t\tcontinue;\n@@ -2783,7 +2783,7 @@ main(int argc, char **argv)\n \t\telse\n \t\t\trte_exit(EXIT_FAILURE, \"failed to register metrics names\");\n \n-\t\tRTE_LCORE_FOREACH_SLAVE(lcore_id) {\n+\t\tRTE_LCORE_FOREACH_WORKER(lcore_id) {\n \t\t\trte_spinlock_init(&stats[lcore_id].telemetry_lock);\n \t\t}\n \t\trte_timer_init(&telemetry_timer);\n@@ -2799,7 +2799,7 @@ main(int argc, char **argv)\n \tif (app_mode == APP_MODE_EMPTY_POLL || app_mode == APP_MODE_TELEMETRY)\n \t\tlaunch_timer(rte_lcore_id());\n \n-\tRTE_LCORE_FOREACH_SLAVE(lcore_id) {\n+\tRTE_LCORE_FOREACH_WORKER(lcore_id) {\n \t\tif (rte_eal_wait_lcore(lcore_id) < 0)\n \t\t\treturn -1;\n \t}\ndiff --git a/examples/link_status_interrupt/main.c b/examples/link_status_interrupt/main.c\nindex 3a920f616c3c..a8b03e231ab0 100644\n--- a/examples/link_status_interrupt/main.c\n+++ b/examples/link_status_interrupt/main.c\n@@ -733,7 +733,7 @@ main(int argc, char **argv)\n \n \t/* launch per-lcore init on every lcore */\n \trte_eal_mp_remote_launch(lsi_launch_one_lcore, NULL, CALL_MAIN);\n-\tRTE_LCORE_FOREACH_SLAVE(lcore_id) {\n+\tRTE_LCORE_FOREACH_WORKER(lcore_id) {\n \t\tif (rte_eal_wait_lcore(lcore_id) < 0)\n \t\t\treturn -1;\n \t}\ndiff --git a/examples/multi_process/simple_mp/main.c b/examples/multi_process/simple_mp/main.c\nindex 86b7d244a91f..109b8bb45dcc 100644\n--- a/examples/multi_process/simple_mp/main.c\n+++ b/examples/multi_process/simple_mp/main.c\n@@ -109,7 +109,7 @@ main(int argc, char **argv)\n \tRTE_LOG(INFO, APP, \"Finished Process Init.\\n\");\n \n \t/* call lcore_recv() on every worker lcore */\n-\tRTE_LCORE_FOREACH_SLAVE(lcore_id) {\n+\tRTE_LCORE_FOREACH_WORKER(lcore_id) {\n \t\trte_eal_remote_launch(lcore_recv, NULL, lcore_id);\n \t}\n \ndiff --git a/examples/ntb/ntb_fwd.c b/examples/ntb/ntb_fwd.c\nindex 5a8439b8d310..f333f451c896 100644\n--- a/examples/ntb/ntb_fwd.c\n+++ b/examples/ntb/ntb_fwd.c\n@@ -162,7 +162,7 @@ cmd_quit_parsed(__rte_unused void *parsed_result,\n \tuint32_t lcore_id;\n \n \t/* Stop transmission first. */\n-\tRTE_LCORE_FOREACH_SLAVE(lcore_id) {\n+\tRTE_LCORE_FOREACH_WORKER(lcore_id) {\n \t\tconf = &fwd_lcore_conf[lcore_id];\n \n \t\tif (!conf->nb_stream)\n@@ -668,7 +668,7 @@ assign_stream_to_lcores(void)\n \tuint8_t lcore_num, nb_extra;\n \n \tlcore_num = rte_lcore_count();\n-\t/* Exclude master core */\n+\t/* Exclude main core */\n \tlcore_num--;\n \n \tnb_streams = (fwd_mode == IOFWD) ? num_queues * 2 : num_queues;\n@@ -678,7 +678,7 @@ assign_stream_to_lcores(void)\n \tsm_id = 0;\n \ti = 0;\n \n-\tRTE_LCORE_FOREACH_SLAVE(lcore_id) {\n+\tRTE_LCORE_FOREACH_WORKER(lcore_id) {\n \t\tconf = &fwd_lcore_conf[lcore_id];\n \n \t\tif (i < nb_extra) {\n@@ -697,7 +697,7 @@ assign_stream_to_lcores(void)\n \t}\n \n \t/* Print packet forwading config. */\n-\tRTE_LCORE_FOREACH_SLAVE(lcore_id) {\n+\tRTE_LCORE_FOREACH_WORKER(lcore_id) {\n \t\tconf = &fwd_lcore_conf[lcore_id];\n \n \t\tif (!conf->nb_stream)\n@@ -765,7 +765,7 @@ start_pkt_fwd(void)\n \tassign_stream_to_lcores();\n \tin_test = 1;\n \n-\tRTE_LCORE_FOREACH_SLAVE(lcore_id) {\n+\tRTE_LCORE_FOREACH_WORKER(lcore_id) {\n \t\tconf = &fwd_lcore_conf[lcore_id];\n \n \t\tif (!conf->nb_stream)\n@@ -826,7 +826,7 @@ cmd_stop_parsed(__rte_unused void *parsed_result,\n \tstruct ntb_fwd_lcore_conf *conf;\n \tuint32_t lcore_id;\n \n-\tRTE_LCORE_FOREACH_SLAVE(lcore_id) {\n+\tRTE_LCORE_FOREACH_WORKER(lcore_id) {\n \t\tconf = &fwd_lcore_conf[lcore_id];\n \n \t\tif (!conf->nb_stream)\n@@ -1074,7 +1074,7 @@ cmdline_parse_ctx_t main_ctx[] = {\n \tNULL,\n };\n \n-/* prompt function, called from main on MASTER lcore */\n+/* prompt function, called from main on MAIN lcore */\n static void\n prompt(void)\n {\ndiff --git a/examples/packet_ordering/main.c b/examples/packet_ordering/main.c\nindex b5fc6c54be56..a79d77a321ef 100644\n--- a/examples/packet_ordering/main.c\n+++ b/examples/packet_ordering/main.c\n@@ -345,10 +345,10 @@ print_stats(void)\n {\n \tuint16_t i;\n \tstruct rte_eth_stats eth_stats;\n-\tunsigned int lcore_id, last_lcore_id, master_lcore_id, end_w_lcore_id;\n+\tunsigned int lcore_id, last_lcore_id, main_lcore_id, end_w_lcore_id;\n \n \tlast_lcore_id   = get_last_lcore_id();\n-\tmaster_lcore_id = rte_get_master_lcore();\n+\tmain_lcore_id = rte_get_main_lcore();\n \tend_w_lcore_id  = get_previous_lcore_id(last_lcore_id);\n \n \tprintf(\"\\nRX thread stats:\\n\");\n@@ -360,7 +360,7 @@ print_stats(void)\n \tfor (lcore_id = 0; lcore_id <= end_w_lcore_id; lcore_id++) {\n \t\tif (insight_worker\n \t\t\t&& rte_lcore_is_enabled(lcore_id)\n-\t\t\t&& lcore_id != master_lcore_id) {\n+\t\t\t&& lcore_id != main_lcore_id) {\n \t\t\tprintf(\"\\nWorker thread stats on core [%u]:\\n\",\n \t\t\t\t\tlcore_id);\n \t\t\tprintf(\" - Pkts deqd from workers ring:\t\t%\"PRIu64\"\\n\",\n@@ -658,7 +658,7 @@ main(int argc, char **argv)\n {\n \tint ret;\n \tunsigned nb_ports;\n-\tunsigned int lcore_id, last_lcore_id, master_lcore_id;\n+\tunsigned int lcore_id, last_lcore_id, main_lcore_id;\n \tuint16_t port_id;\n \tuint16_t nb_ports_available;\n \tstruct worker_thread_args worker_args = {NULL, NULL};\n@@ -745,32 +745,32 @@ main(int argc, char **argv)\n \t}\n \n \tlast_lcore_id   = get_last_lcore_id();\n-\tmaster_lcore_id = rte_get_master_lcore();\n+\tmain_lcore_id = rte_get_main_lcore();\n \n \tworker_args.ring_in  = rx_to_workers;\n \tworker_args.ring_out = workers_to_tx;\n \n-\t/* Start worker_thread() on all the available slave cores but the last 1 */\n+\t/* Start worker_thread() on all the available worker cores but the last 1 */\n \tfor (lcore_id = 0; lcore_id <= get_previous_lcore_id(last_lcore_id); lcore_id++)\n-\t\tif (rte_lcore_is_enabled(lcore_id) && lcore_id != master_lcore_id)\n+\t\tif (rte_lcore_is_enabled(lcore_id) && lcore_id != main_lcore_id)\n \t\t\trte_eal_remote_launch(worker_thread, (void *)&worker_args,\n \t\t\t\t\tlcore_id);\n \n \tif (disable_reorder) {\n-\t\t/* Start tx_thread() on the last slave core */\n+\t\t/* Start tx_thread() on the last worker core */\n \t\trte_eal_remote_launch((lcore_function_t *)tx_thread, workers_to_tx,\n \t\t\t\tlast_lcore_id);\n \t} else {\n \t\tsend_args.ring_in = workers_to_tx;\n-\t\t/* Start send_thread() on the last slave core */\n+\t\t/* Start send_thread() on the last worker core */\n \t\trte_eal_remote_launch((lcore_function_t *)send_thread,\n \t\t\t\t(void *)&send_args, last_lcore_id);\n \t}\n \n-\t/* Start rx_thread() on the master core */\n+\t/* Start rx_thread() on the main core */\n \trx_thread(rx_to_workers);\n \n-\tRTE_LCORE_FOREACH_SLAVE(lcore_id) {\n+\tRTE_LCORE_FOREACH_WORKER(lcore_id) {\n \t\tif (rte_eal_wait_lcore(lcore_id) < 0)\n \t\t\treturn -1;\n \t}\ndiff --git a/examples/ptpclient/ptpclient.c b/examples/ptpclient/ptpclient.c\nindex 20da32517095..09968cdfc7ca 100644\n--- a/examples/ptpclient/ptpclient.c\n+++ b/examples/ptpclient/ptpclient.c\n@@ -372,7 +372,7 @@ parse_sync(struct ptpv2_data_slave_ordinary *ptp_data, uint16_t rx_tstamp_idx)\n }\n \n /*\n- * Parse the PTP FOLLOWUP message and send DELAY_REQ to the master clock.\n+ * Parse the PTP FOLLOWUP message and send DELAY_REQ to the main clock.\n  */\n static void\n parse_fup(struct ptpv2_data_slave_ordinary *ptp_data)\n@@ -782,7 +782,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/rxtx_callbacks/main.c b/examples/rxtx_callbacks/main.c\nindex 54d124b00bc9..6fe39546dd52 100644\n--- a/examples/rxtx_callbacks/main.c\n+++ b/examples/rxtx_callbacks/main.c\n@@ -302,7 +302,7 @@ main(int argc, char *argv[])\n \t\tprintf(\"\\nWARNING: Too much enabled lcores - \"\n \t\t\t\"App uses only 1 lcore\\n\");\n \n-\t/* call lcore_main on master core only */\n+\t/* call lcore_main on main core only */\n \tlcore_main();\n \treturn 0;\n }\ndiff --git a/examples/server_node_efd/server/main.c b/examples/server_node_efd/server/main.c\nindex 05f961cff5d0..4728960eaf22 100644\n--- a/examples/server_node_efd/server/main.c\n+++ b/examples/server_node_efd/server/main.c\n@@ -95,7 +95,7 @@ get_printable_mac_addr(uint16_t port)\n /*\n  * This function displays the recorded statistics for each port\n  * and for each node. It uses ANSI terminal codes to clear\n- * screen when called. It is called from a single non-master\n+ * screen when called. It is called from a single worker\n  * thread in the server process, when the process is run with more\n  * than one lcore enabled.\n  */\n@@ -168,7 +168,7 @@ do_stats_display(void)\n }\n \n /*\n- * The function called from each non-master lcore used by the process.\n+ * The function called from each non-main lcore used by the process.\n  * The test_and_set function is used to randomly pick a single lcore on which\n  * the code to display the statistics will run. Otherwise, the code just\n  * repeatedly sleeps.\n@@ -290,7 +290,7 @@ process_packets(uint32_t port_num __rte_unused, struct rte_mbuf *pkts[],\n }\n \n /*\n- * Function called by the master lcore of the DPDK process.\n+ * Function called by the main lcore of the DPDK process.\n  */\n static void\n do_packet_forwarding(void)\n@@ -330,8 +330,8 @@ main(int argc, char *argv[])\n \t/* clear statistics */\n \tclear_stats();\n \n-\t/* put all other cores to sleep bar master */\n-\trte_eal_mp_remote_launch(sleep_lcore, NULL, SKIP_MASTER);\n+\t/* put all other cores to sleep except main */\n+\trte_eal_mp_remote_launch(sleep_lcore, NULL, SKIP_MAIN);\n \n \tdo_packet_forwarding();\n \treturn 0;\ndiff --git a/examples/skeleton/basicfwd.c b/examples/skeleton/basicfwd.c\nindex 72ba85fa1fe5..4b2b6ab4ff78 100644\n--- a/examples/skeleton/basicfwd.c\n+++ b/examples/skeleton/basicfwd.c\n@@ -202,7 +202,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/tep_termination/main.c b/examples/tep_termination/main.c\nindex 232ed59b6ec6..15bf8bbf7f77 100644\n--- a/examples/tep_termination/main.c\n+++ b/examples/tep_termination/main.c\n@@ -835,7 +835,7 @@ init_data_ll(void)\n {\n \tint lcore;\n \n-\tRTE_LCORE_FOREACH_SLAVE(lcore) {\n+\tRTE_LCORE_FOREACH_WORKER(lcore) {\n \t\tlcore_info[lcore].lcore_ll =\n \t\t\tmalloc(sizeof(struct lcore_ll_info));\n \t\tif (lcore_info[lcore].lcore_ll == NULL) {\n@@ -927,7 +927,7 @@ destroy_device(int vid)\n \trm_data_ll_entry(&ll_root_used, ll_main_dev_cur, ll_main_dev_last);\n \n \t/* Set the dev_removal_flag on each lcore. */\n-\tRTE_LCORE_FOREACH_SLAVE(lcore) {\n+\tRTE_LCORE_FOREACH_WORKER(lcore) {\n \t\tlcore_info[lcore].lcore_ll->dev_removal_flag =\n \t\t\tREQUEST_DEV_REMOVAL;\n \t}\n@@ -938,7 +938,7 @@ destroy_device(int vid)\n \t * the device removed from the linked lists and that the devices\n \t * are no longer in use.\n \t */\n-\tRTE_LCORE_FOREACH_SLAVE(lcore) {\n+\tRTE_LCORE_FOREACH_WORKER(lcore) {\n \t\twhile (lcore_info[lcore].lcore_ll->dev_removal_flag\n \t\t\t!= ACK_DEV_REMOVAL)\n \t\t\trte_pause();\n@@ -998,7 +998,7 @@ new_device(int vid)\n \tvdev->remove = 0;\n \n \t/* Find a suitable lcore to add the device. */\n-\tRTE_LCORE_FOREACH_SLAVE(lcore) {\n+\tRTE_LCORE_FOREACH_WORKER(lcore) {\n \t\tif (lcore_info[lcore].lcore_ll->device_num < device_num_min) {\n \t\t\tdevice_num_min = lcore_info[lcore].lcore_ll->device_num;\n \t\t\tcore_add = lcore;\n@@ -1204,7 +1204,7 @@ main(int argc, char *argv[])\n \t}\n \n \t/* Launch all data cores. */\n-\tRTE_LCORE_FOREACH_SLAVE(lcore_id) {\n+\tRTE_LCORE_FOREACH_WORKER(lcore_id) {\n \t\trte_eal_remote_launch(switch_worker,\n \t\t\tmbuf_pool, lcore_id);\n \t}\n@@ -1228,7 +1228,7 @@ main(int argc, char *argv[])\n \t\t\t\"failed to start vhost driver.\\n\");\n \t}\n \n-\tRTE_LCORE_FOREACH_SLAVE(lcore_id)\n+\tRTE_LCORE_FOREACH_WORKER(lcore_id)\n \t\trte_eal_wait_lcore(lcore_id);\n \n \treturn 0;\ndiff --git a/examples/timer/main.c b/examples/timer/main.c\nindex 0259022f104e..5a57e482909f 100644\n--- a/examples/timer/main.c\n+++ b/examples/timer/main.c\n@@ -100,7 +100,7 @@ main(int argc, char **argv)\n \trte_timer_init(&timer0);\n \trte_timer_init(&timer1);\n \n-\t/* load timer0, every second, on master lcore, reloaded automatically */\n+\t/* load timer0, every second, on main lcore, reloaded automatically */\n \thz = rte_get_timer_hz();\n \tlcore_id = rte_lcore_id();\n \trte_timer_reset(&timer0, hz, PERIODICAL, lcore_id, timer0_cb, NULL);\n@@ -109,12 +109,12 @@ main(int argc, char **argv)\n \tlcore_id = rte_get_next_lcore(lcore_id, 0, 1);\n \trte_timer_reset(&timer1, hz/3, SINGLE, lcore_id, timer1_cb, NULL);\n \n-\t/* call lcore_mainloop() on every slave lcore */\n-\tRTE_LCORE_FOREACH_SLAVE(lcore_id) {\n+\t/* call lcore_mainloop() on every worker lcore */\n+\tRTE_LCORE_FOREACH_WORKER(lcore_id) {\n \t\trte_eal_remote_launch(lcore_mainloop, NULL, lcore_id);\n \t}\n \n-\t/* call it on master lcore too */\n+\t/* call it on main lcore too */\n \t(void) lcore_mainloop(NULL);\n \n \treturn 0;\ndiff --git a/examples/vhost/main.c b/examples/vhost/main.c\nindex e1578e79569a..7ef77deb0eb5 100644\n--- a/examples/vhost/main.c\n+++ b/examples/vhost/main.c\n@@ -1202,7 +1202,7 @@ destroy_device(int vid)\n \n \n \t/* Set the dev_removal_flag on each lcore. */\n-\tRTE_LCORE_FOREACH_SLAVE(lcore)\n+\tRTE_LCORE_FOREACH_WORKER(lcore)\n \t\tlcore_info[lcore].dev_removal_flag = REQUEST_DEV_REMOVAL;\n \n \t/*\n@@ -1210,7 +1210,7 @@ destroy_device(int vid)\n \t * we can be sure that they can no longer access the device removed\n \t * from the linked lists and that the devices are no longer in use.\n \t */\n-\tRTE_LCORE_FOREACH_SLAVE(lcore) {\n+\tRTE_LCORE_FOREACH_WORKER(lcore) {\n \t\twhile (lcore_info[lcore].dev_removal_flag != ACK_DEV_REMOVAL)\n \t\t\trte_pause();\n \t}\n@@ -1255,7 +1255,7 @@ new_device(int vid)\n \tvdev->remove = 0;\n \n \t/* Find a suitable lcore to add the device. */\n-\tRTE_LCORE_FOREACH_SLAVE(lcore) {\n+\tRTE_LCORE_FOREACH_WORKER(lcore) {\n \t\tif (lcore_info[lcore].device_num < device_num_min) {\n \t\t\tdevice_num_min = lcore_info[lcore].device_num;\n \t\t\tcore_add = lcore;\n@@ -1504,7 +1504,7 @@ main(int argc, char *argv[])\n \t}\n \n \t/* Launch all data cores. */\n-\tRTE_LCORE_FOREACH_SLAVE(lcore_id)\n+\tRTE_LCORE_FOREACH_WORKER(lcore_id)\n \t\trte_eal_remote_launch(switch_worker, NULL, lcore_id);\n \n \tif (client_mode)\n@@ -1565,7 +1565,7 @@ main(int argc, char *argv[])\n \t\t}\n \t}\n \n-\tRTE_LCORE_FOREACH_SLAVE(lcore_id)\n+\tRTE_LCORE_FOREACH_WORKER(lcore_id)\n \t\trte_eal_wait_lcore(lcore_id);\n \n \treturn 0;\ndiff --git a/examples/vmdq/main.c b/examples/vmdq/main.c\nindex 660be4011e16..3cb890fa2b2b 100644\n--- a/examples/vmdq/main.c\n+++ b/examples/vmdq/main.c\n@@ -653,8 +653,8 @@ main(int argc, char *argv[])\n \t}\n \n \t/* call lcore_main() on every lcore */\n-\trte_eal_mp_remote_launch(lcore_main, NULL, CALL_MASTER);\n-\tRTE_LCORE_FOREACH_SLAVE(lcore_id) {\n+\trte_eal_mp_remote_launch(lcore_main, NULL, CALL_MAIN);\n+\tRTE_LCORE_FOREACH_WORKER(lcore_id) {\n \t\tif (rte_eal_wait_lcore(lcore_id) < 0)\n \t\t\treturn -1;\n \t}\ndiff --git a/examples/vmdq_dcb/main.c b/examples/vmdq_dcb/main.c\nindex 83a6843ee5b0..1a7436463806 100644\n--- a/examples/vmdq_dcb/main.c\n+++ b/examples/vmdq_dcb/main.c\n@@ -699,12 +699,12 @@ main(int argc, char *argv[])\n \t\t\trte_exit(EXIT_FAILURE, \"Cannot initialize network ports\\n\");\n \t}\n \n-\t/* call lcore_main() on every slave lcore */\n+\t/* call lcore_main() on every worker lcore */\n \ti = 0;\n-\tRTE_LCORE_FOREACH_SLAVE(lcore_id) {\n+\tRTE_LCORE_FOREACH_WORKER(lcore_id) {\n \t\trte_eal_remote_launch(lcore_main, (void*)i++, lcore_id);\n \t}\n-\t/* call on master too */\n+\t/* call on main too */\n \t(void) lcore_main((void*)i);\n \n \treturn 0;\n",
    "prefixes": [
        "v3",
        "17/17"
    ]
}