From patchwork Wed Jul 1 19:46:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 72650 Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id EE9DBA0350; Wed, 1 Jul 2020 21:49:02 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 877DF1D483; Wed, 1 Jul 2020 21:47:20 +0200 (CEST) Received: from mail-pf1-f193.google.com (mail-pf1-f193.google.com [209.85.210.193]) by dpdk.org (Postfix) with ESMTP id 519F91C1C0 for ; Wed, 1 Jul 2020 21:47:18 +0200 (CEST) Received: by mail-pf1-f193.google.com with SMTP id u5so11443753pfn.7 for ; Wed, 01 Jul 2020 12:47:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=vJSz10Nndq1TBf16R1LDZG59khgZOuxUwZTccNKXjno=; b=PixcX74fuvBGMVHmu2oOSUc99ZHz3EEg1psmDH4P5dzmYQTXT434qHamte3U1azSmb epQewE1aGquqGGKkJ0sODV7SykS+45F1TrdpiSdhsXPfpNpZKiZHis3woNtBPMZ7rf63 wjm4utMhbm8W2EB5o/2gX3kZMR1dcrJZ0/AuIRt9yF6QbITb0sbAjdXrXTFEHurwwvTG cavBhoe856R8uBnq8V6EqUoYQqqdk7ATC/eHfH7mfHtSChWrtJv0oPOmYrIVd9GAwZaD LAkLBBLm2Lje8xOtn12QRfUmS5H4U2TIvDWzTHCdlkeJhd2zaFpS6hLhmwFvywngngh+ F47A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=vJSz10Nndq1TBf16R1LDZG59khgZOuxUwZTccNKXjno=; b=e/q26OpCRANRBi/jIdg8CHZ+SkNt5+hrzkwXycbvLDWWzduMz5o3wGV1e5+Qcdt2km MRBulRbsaDaXsg8foUNMD1QpjJJ6FUm0hNnEj84pHxoYmWlnFkBRrGIIyH4/UW9dH/0G AZkRuLyVRzOqYz5ZNZGNWjMjtUd4YaMqiw+hPH7+LZTcg22EFQgSX5d7NuPZHIDf1sJd jNYlHkh2Po5jnKMY5IkeTNumfVAwSiW1C50UryqhjQUFCwVKN5za7cdcY5MgkKdd+yw+ PuQBjZZHJGsy57wlE5lTup1eT3CI1asl2Ihuz+Ht02VnSR+xmCpv6ltqj8HJfgexDVnb JHIg== X-Gm-Message-State: AOAM5331uWYexZI6w0GDXC+OejnwSEenHY0VpngXuVIYk3LGPVGw6aUv S5PeJmqTA3Vx6iUqVb7ackjHBtnZ2hA= X-Google-Smtp-Source: ABdhPJxXrzxFeNhQKrQXNHHM85EpHn7kLGbqJXgJpl8k38t14tuEq6JUVKZq0kIzxltvvttMPbLUcA== X-Received: by 2002:a63:c44b:: with SMTP id m11mr20278959pgg.404.1593632837083; Wed, 01 Jul 2020 12:47:17 -0700 (PDT) Received: from hermes.corp.microsoft.com (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id n14sm6501870pgd.78.2020.07.01.12.47.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jul 2020 12:47:16 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Wed, 1 Jul 2020 12:46:36 -0700 Message-Id: <20200701194650.10705-14-stephen@networkplumber.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200701194650.10705-1-stephen@networkplumber.org> References: <20200604210200.25405-1-stephen@networkplumber.org> <20200701194650.10705-1-stephen@networkplumber.org> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v3 13/27] examples/multi_process: replace references to master lcore X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Use initial lcore instead. Signed-off-by: Stephen Hemminger --- .../multi_process/client_server_mp/mp_server/main.c | 10 +++++----- examples/multi_process/simple_mp/main.c | 6 +++--- examples/multi_process/symmetric_mp/main.c | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/examples/multi_process/client_server_mp/mp_server/main.c b/examples/multi_process/client_server_mp/mp_server/main.c index 280dab867281..8b9c6ca12a66 100644 --- a/examples/multi_process/client_server_mp/mp_server/main.c +++ b/examples/multi_process/client_server_mp/mp_server/main.c @@ -84,7 +84,7 @@ get_printable_mac_addr(uint16_t port) /* * This function displays the recorded statistics for each port * and for each client. It uses ANSI terminal codes to clear - * screen when called. It is called from a single non-master + * screen when called. It is called from a single worker * thread in the server process, when the process is run with more * than one lcore enabled. */ @@ -146,7 +146,7 @@ do_stats_display(void) } /* - * The function called from each non-master lcore used by the process. + * The function called from each worker lcore used by the process. * The test_and_set function is used to randomly pick a single lcore on which * the code to display the statistics will run. Otherwise, the code just * repeatedly sleeps. @@ -244,7 +244,7 @@ process_packets(uint32_t port_num __rte_unused, } /* - * Function called by the master lcore of the DPDK process. + * Function called by the initial lcore of the DPDK process. */ static void do_packet_forwarding(void) @@ -297,8 +297,8 @@ main(int argc, char *argv[]) /* clear statistics */ clear_stats(); - /* put all other cores to sleep bar master */ - rte_eal_mp_remote_launch(sleep_lcore, NULL, SKIP_MASTER); + /* put all other cores to sleep execpt inital core */ + rte_eal_mp_remote_launch(sleep_lcore, NULL, SKIP_INITIAL); do_packet_forwarding(); return 0; diff --git a/examples/multi_process/simple_mp/main.c b/examples/multi_process/simple_mp/main.c index fc79528462e9..f89d46a720b2 100644 --- a/examples/multi_process/simple_mp/main.c +++ b/examples/multi_process/simple_mp/main.c @@ -108,12 +108,12 @@ main(int argc, char **argv) RTE_LOG(INFO, APP, "Finished Process Init.\n"); - /* call lcore_recv() on every slave lcore */ - RTE_LCORE_FOREACH_SLAVE(lcore_id) { + /* call lcore_recv() on every worker lcore */ + RTE_LCORE_FOREACH_WORKER(lcore_id) { rte_eal_remote_launch(lcore_recv, NULL, lcore_id); } - /* call cmd prompt on master lcore */ + /* call cmd prompt on initial lcore */ struct cmdline *cl = cmdline_stdin_new(simple_mp_ctx, "\nsimple_mp > "); if (cl == NULL) rte_exit(EXIT_FAILURE, "Cannot create cmdline instance\n"); diff --git a/examples/multi_process/symmetric_mp/main.c b/examples/multi_process/symmetric_mp/main.c index 9a16e198cbf4..683062a627a2 100644 --- a/examples/multi_process/symmetric_mp/main.c +++ b/examples/multi_process/symmetric_mp/main.c @@ -473,7 +473,7 @@ main(int argc, char **argv) RTE_LOG(INFO, APP, "Finished Process Init.\n"); - rte_eal_mp_remote_launch(lcore_main, NULL, CALL_MASTER); + rte_eal_mp_remote_launch(lcore_main, NULL, CALL_INITIAL); return 0; }