From patchwork Wed Jul 1 20:23:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 72678 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 92F86A0350; Wed, 1 Jul 2020 22:26:18 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 265E61D5F1; Wed, 1 Jul 2020 22:24:29 +0200 (CEST) Received: from mail-pj1-f68.google.com (mail-pj1-f68.google.com [209.85.216.68]) by dpdk.org (Postfix) with ESMTP id 6BD151D5CF for ; Wed, 1 Jul 2020 22:24:26 +0200 (CEST) Received: by mail-pj1-f68.google.com with SMTP id gc15so3406987pjb.0 for ; Wed, 01 Jul 2020 13:24:26 -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=lHsyxUuZUpLUuFWsecBVeVzs2e1t3ETYzkCPS4O3x0U=; b=bk5chkeILxRCtES6M/NRS7+ycyEzW3TboggVhy6RYqZv+scLAlmL/T5M5La7P3BmNK VT6hL0hPKL/YMHWG7KOssUbYmDdqx6D6dEMrhPItgvviBb4NYK67gPsgoEMmJWEOgxBD WwLpMOQ6ciPy00hso729DHcKtwcWFWSatpRUr4dNztEGO25q2FF/4SGY60dVhcsyPoX5 DCGLvGHAbJE39yYNrnat16Hfy2uRZbvLtol6fdyp6fRlUC6Ye4D37H3bRSo0cp8zGI2X cL1mhsLR8sZ2SW5W5LgKET/UuGaPLRwYnC3VgpV5GCST8eh79zXAgkjUgGPjXyGdjQRL S1/g== 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=lHsyxUuZUpLUuFWsecBVeVzs2e1t3ETYzkCPS4O3x0U=; b=ijbi7DBs1oVkkrLpTnm5jrW0hQQ2lwUi73Hx1bjQsvMxvGuZhJNXJPAmIO7Y3OGYsF vYTr0Bp3fatiIf+0y4623cuMuW+egAMCjXy6WwUg2V9/E4ROOETOQOogiR6lsxvg8Irl jTbGxiz1wUrkrdELh90AgZ2XY7JLjLIohxesXlMrd2xEJYGhibVL+Gin87OKE9ObXvC+ 7OsYWKaM/OTs5o5wk1nBtBEsgtJsmqDfo4E+0cDkdTKCsVx35m6ZY9DGVABarIGwrdKo rhDPkCH3829ZBI0b+RNpnGTqg5rsbG8OcvWxbkE+ruTzy29bHOeBXVON8xAVDkLBE8WL cLpA== X-Gm-Message-State: AOAM533atBJB75+NV5Svak5o/AzUEUaMKMAHOm8GGj5CFsr5saSsFD6Z VrQt0JWn5MME9zVED3a0F9aGdHVI0Sk= X-Google-Smtp-Source: ABdhPJxibRK9R3yGBuSp9muJ5lgRdgBAJJIK5BTWl2pRUbEgig6/p0QzKetEt4bGo7C/Im0r1PSMzQ== X-Received: by 2002:a17:902:7204:: with SMTP id ba4mr22609440plb.250.1593635065135; Wed, 01 Jul 2020 13:24:25 -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 g8sm6584803pgr.70.2020.07.01.13.24.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jul 2020 13:24:24 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Wed, 1 Jul 2020 13:23:45 -0700 Message-Id: <20200701202359.17006-14-stephen@networkplumber.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200701202359.17006-1-stephen@networkplumber.org> References: <20200604210200.25405-1-stephen@networkplumber.org> <20200701202359.17006-1-stephen@networkplumber.org> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v4 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 Acked-by: Anatoly Burakov --- .../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..d9aac4648f1d 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 initial 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; }