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 B29F0A04DB; Fri, 16 Oct 2020 01:02:40 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 5B3D31E863; Fri, 16 Oct 2020 00:58:19 +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 1C5B21E540 for ; Fri, 16 Oct 2020 00:58:06 +0200 (CEST) Received: by mail-pg1-f194.google.com with SMTP id y14so207107pgf.12 for ; Thu, 15 Oct 2020 15:58:06 -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=ZfnZURO0PwDcxx1cnh+uzAB8HCsgRsj6TO8YuWdZbmVfRn5af2hKBTXxZclNq8bM3+ WIdpVP+fQVeQNcncyalr5E3T+MaZLl2JY77HqtTPD448dr4DCraZS1VwVyqMIa/DiI0S qr/NkYzZ72nnHg7FG3Zb+zx52DjvB1MQS8NUU68wei2L84J3so+b12hIJh+sgpFMzbrJ ms3dXO4zLM8RLR0nGlJ0uOAaWAN+dHGzKBU/RAaXfLKMOnO65SpOWIhDTkvJrjR8nV2H qorQ4V9WkYnFjeQuKVrJaxXktQ3BNhNMWP9/HvcFcQg8WAfHGhPUN3wn/IaaWRH9HN+X vb/A== 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=mf7sTFZt1DSm0CE8inNVAUrXmLkZnwEk54qAR1Dna4QXhUo8OlmbKTCKnIBzJL8VQQ SdvY520s/09LSGDG80dvCR+/NVcl6q7S3ssAqxeQLvp5XyVP9LA/LShtAhej75YsC2BE JXTUyFrBEU6gYLyy8Ro5XiCGTX5szODQ23kDkY84k7uW9Wm//gK3KCr/9BAssHWxcJ6e N3djs7r3KVr0gx1DOpQuATiKlEQdpCY4nRR4Ad1vKLROFfmdXgCOG77e3ORfXZh+6lf4 S1TpVfrhuXiK69Ug0/ZJPh0LiNSGc70FRwYh3ZVW2cmdWolb/RfLjV1ehEFbuhLM0C/Z CCNA== X-Gm-Message-State: AOAM530f64bfaARwsQ3VrPPHy81mV0MMOMaOZWnH2tqBe4fL4qiJ68gO uE+D5B4Q9hpKGuagmJVdxlufncCMZQbi5A== X-Google-Smtp-Source: ABdhPJwiaQIsp8qJP7vyd0A7NA8erGLTuAyhq3YQdqZ3/+ShnHy5M18YHKoG4LXPpXn9qorT3jh8sg== X-Received: by 2002:a62:1c87:0:b029:155:4601:ab9f with SMTP id c129-20020a621c870000b02901554601ab9fmr853635pfc.12.1602802684892; Thu, 15 Oct 2020 15:58:04 -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 x4sm324055pfm.86.2020.10.15.15.58.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Oct 2020 15:58:03 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Anatoly Burakov Date: Thu, 15 Oct 2020 15:57:29 -0700 Message-Id: <20201015225736.12167-14-stephen@networkplumber.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201015225736.12167-1-stephen@networkplumber.org> References: <20200911190701.29171-1-stephen@networkplumber.org> <20201015225736.12167-1-stephen@networkplumber.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH v7 13/20] 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