From patchwork Fri Jun 5 22:57:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 70901 X-Patchwork-Delegate: thomas@monjalon.net 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 073E3A0350; Sat, 6 Jun 2020 01:01:07 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id BFED91D63A; Sat, 6 Jun 2020 00:59:18 +0200 (CEST) Received: from mail-pg1-f194.google.com (mail-pg1-f194.google.com [209.85.215.194]) by dpdk.org (Postfix) with ESMTP id 625041D514 for ; Sat, 6 Jun 2020 00:59:15 +0200 (CEST) Received: by mail-pg1-f194.google.com with SMTP id e9so5826565pgo.9 for ; Fri, 05 Jun 2020 15:59:15 -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=AxQJ5A0GXmwcTgZ0NqOIQUYmaiQJcRJnY4kyWNQW0NY=; b=nVXLG/fwkeuQFTADyo4FdntkKUas0nqq0FOetxeGtJhVZ4ip8wUbZVvKZBZOJADJ1c RsvQa1K7jr7iOP4HUOdSDGqCyLuDZkuoBvZKsIuu2opL0MMmtBNLQ1xAB99qNjlsuWVs vZ6gD4fJ9ZpcFsUIhRMC/PVrpinOhKYgumXKpPLbt0VYx/lwUumsH8tbs8jQpeymr3Ef 1kYhF9y8/EvR9jzkT2K64ygxNWNhpTLuNscYwk4tmXS7PMQaXDcnyJ+9WepjP9dMqpyc uKC143U30oZ7VI1GK4lcaCvCDXGESe0Z+BLESwVGrQ1oQulBnr81nDCDHDmSY7IEouiQ OKGw== 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=AxQJ5A0GXmwcTgZ0NqOIQUYmaiQJcRJnY4kyWNQW0NY=; b=AEeXRBvrbj4gH2ClXPFVQsdhrgDn6kZsYx29xzKpVKYfWFCDSeLvJCpNZJrBrbm7E+ O7DLC+QJbwzdzNm29qpw2/x9sW9t4xDUNjHTD8qmBJgCwiu8pzsWWbpzCI5wXxHS3mw1 H4NmHrdnhjn38y2y+o2jj2/28M6He67IFNRtel0I1lMC2CpmAvNsUnoGZSYu51Z1NTk4 joBJKeV+mUMjng3Y1foN29L2iGQc8OcnNaE0QMVUWIkXb9Qmn6XxEv9qb2/4+LEI89Bq TwbMnS8z4IUlao2QzPwjiaWP28fnfZXXwkWzoOvYr/xnkH+WUkvdL6DvkVmr5JFzFP2i pN7A== X-Gm-Message-State: AOAM5326Gf7ynK56STtAYbFubC9FU4H+9kRlFL7Bk4STtAMgUGlTd9OR 88YCfHLDEJbTpT58lRQlOs2+sKfsljg= X-Google-Smtp-Source: ABdhPJwHEbgpL/y6M5T7D4KT7OWwGB2kgs7uja4MJWZchSMPbDZaHxthPnAqcxayJgWWJyrkFywTuQ== X-Received: by 2002:a63:f14a:: with SMTP id o10mr11802205pgk.216.1591397954135; Fri, 05 Jun 2020 15:59:14 -0700 (PDT) Received: from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id j186sm543121pfb.220.2020.06.05.15.59.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Jun 2020 15:59:13 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Fri, 5 Jun 2020 15:57:58 -0700 Message-Id: <20200605225811.26342-14-stephen@networkplumber.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200605225811.26342-1-stephen@networkplumber.org> References: <20200604210200.25405-1-stephen@networkplumber.org> <20200605225811.26342-1-stephen@networkplumber.org> MIME-Version: 1.0 Subject: [dpdk-dev] [RFC v2 13/26] 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; }