From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 98D3DA04B7; Wed, 14 Oct 2020 17:33:33 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 6DAA21DF95; Wed, 14 Oct 2020 17:28:30 +0200 (CEST) Received: from mail-pl1-f196.google.com (mail-pl1-f196.google.com [209.85.214.196]) by dpdk.org (Postfix) with ESMTP id 4761F1DED5 for ; Wed, 14 Oct 2020 17:28:21 +0200 (CEST) Received: by mail-pl1-f196.google.com with SMTP id o8so1961853pll.4 for ; Wed, 14 Oct 2020 08:28:21 -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=a0z7r16d0ZeHHG9q5BcGyVtahTB/OGNxQ5C6knImBzc=; b=0sk4OoQi30JD9zM9EcNPL6a7ESAAKUmhJ1aZ+DKesR4MxUc3Fhb5/eiEQnf5COlPYM Hx5cW2dFex+918i56p35pXJlxaYmYyGCZVVLyr6cCU8lPTXzQ+Db4NhiyqeTQdYp0Jw8 fn4uc7/lgC9MqNOt4M/DivxdxGJARLmaat9FVJF+PT7Wdew2qev+aAmbQUT7dSuiurwT DPBV7KeYPjsTjIc3y6SypkaEXrl3wiJztSmhG2PW5zQGmRlH0TDgd6p4K0VkMDa3g+Sb U/8//tidGtbpSFruj9RhYoyC6I6lbfrIfv8kcxzcLJE7jOGtXFxHZLdek+BgGs7+plf/ zqDw== 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=a0z7r16d0ZeHHG9q5BcGyVtahTB/OGNxQ5C6knImBzc=; b=r3eifAoYx0EBy8HPwei2PEREvR2Z1MJK9biaAzH004Dic2ceLg0g239hohoFui0yUD W1wM04vUXKUUrNj9fDnWvag4h6ew+NW2pFJPHoUAr6QK5iQrCmlfx+LzIkKvLKlTItQg hm5/beEQwiOdTi/8y4HvJijaxVXNYghCCqt8m+YdOv9VDumxeVijmK1TktkYnZUPByvj D+XvSPoYqaOVR1YKFd6Z9J0DuI3AErSzwnMorEJEHOYPwnEAdmZKkqpSxmCwzLg6avZa wXbK78kDjXaNjb/4FBvAsFgLGKXGZHGI3jg//ges2Zd9HBTfRTgh9xA1ApVrc+lYb4Q4 DfcA== X-Gm-Message-State: AOAM531CKUJgj6gU798s137bdrSofCCCnUq6xX2djpHK+GpHBlvmqPBI mDfZn9rxbgE4zaeW32moRiFx/sNpOk74iw== X-Google-Smtp-Source: ABdhPJydWAai0tqbP+gvFVW6KmnGQMSHCkwyidN58MyL8ImMA4Ba+1Ywl2QZxvQbjp9552WHmlvvHQ== X-Received: by 2002:a17:902:708c:b029:d3:ec3c:381c with SMTP id z12-20020a170902708cb02900d3ec3c381cmr4798664plk.20.1602689298967; Wed, 14 Oct 2020 08:28:18 -0700 (PDT) Received: from hermes.local (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id j11sm3653457pfh.143.2020.10.14.08.28.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Oct 2020 08:28:17 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Anatoly Burakov Date: Wed, 14 Oct 2020 08:27:51 -0700 Message-Id: <20201014152756.6518-14-stephen@networkplumber.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201014152756.6518-1-stephen@networkplumber.org> References: <20200911190701.29171-1-stephen@networkplumber.org> <20201014152756.6518-1-stephen@networkplumber.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH v6 13/18] examples/multi_process: replace references to master/slave 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" Replace master with main and slave with worker. Fix the wording in comments. Acked-by: Anatoly Burakov Signed-off-by: Stephen Hemminger --- .../multi_process/client_server_mp/mp_server/main.c | 10 +++++----- examples/multi_process/simple_mp/main.c | 4 ++-- examples/multi_process/symmetric_mp/main.c | 2 +- 3 files changed, 8 insertions(+), 8 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..ec7f6b11f30e 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 main 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 except main */ + rte_eal_mp_remote_launch(sleep_lcore, NULL, SKIP_MAIN); 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..86b7d244a91f 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 */ + /* call lcore_recv() on every worker lcore */ RTE_LCORE_FOREACH_SLAVE(lcore_id) { rte_eal_remote_launch(lcore_recv, NULL, lcore_id); } - /* call cmd prompt on master lcore */ + /* call cmd prompt on main 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 33643d354ee9..ae7f5e0d5076 100644 --- a/examples/multi_process/symmetric_mp/main.c +++ b/examples/multi_process/symmetric_mp/main.c @@ -470,7 +470,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_MAIN); return 0; } -- 2.27.0