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 02004A04C0; Fri, 11 Sep 2020 21:09:11 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 6E39E1C1AB; Fri, 11 Sep 2020 21:07:29 +0200 (CEST) Received: from mail-pj1-f67.google.com (mail-pj1-f67.google.com [209.85.216.67]) by dpdk.org (Postfix) with ESMTP id 1757A1C10A for ; Fri, 11 Sep 2020 21:07:25 +0200 (CEST) Received: by mail-pj1-f67.google.com with SMTP id b17so2133126pji.1 for ; Fri, 11 Sep 2020 12:07:25 -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=Xtcybjp8nXmdj1WLK+/ToG0DZTS7OHhF9+5fJA4hreg=; b=PDbRswfM2PhgDN7xeDLoOMD0mcWCo5/bBVzJnTZ+k1EpgI37NcPcnrPKbE/mmOMyBp owUhizcgqn0y3d5lakHgTn2PXaQ1rkE4FLRxCBvz7Wvw6mWdeP5dz+iCYcEe17pAxeYr 2Aj2dAT73Pn23xbALz1pCW3fBFH9gpmArzhRwnLG87CIBB018bu1biU4hH6NeLvtJ5uq wDFiOrnM80NCMrdRcjepkvtUZxbUzfMqMLJ4OJyVkuKRH7mqyuaTIk3MDPPzkhcnOU9e VWGx6OKsilkdksD3TCZ636erTxAy92Eq+DYZF7pW8rLhRSM+rktk2EMhciV5dyRbgJ+8 6Xjw== 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=Xtcybjp8nXmdj1WLK+/ToG0DZTS7OHhF9+5fJA4hreg=; b=fLHUpvh2NUEk/a7Y/umGJlu2WcsusQz9U01kqYoKCsiqJpmyI9tdVA/Os2ZhE2gUAI 1tN2CBi389JoQfxvNgOJLacofWGa0hZW7NRw50PhdLvoc0TEC6qjKDTUepE649YdX4FJ D8E2D8MZLeX3ZTujUa5+0Dq4JcxAzcKMM76X4LMhFICucHe40fSaMH2gn6jwMMzr185X fVjdSvAYoO8dydEeE9W+2O5LLSxTWiptagulAT5VrXXDQxBa62glZKbY83MMmmv9lcn6 iy2dWPOVj4+jOBdyccZSZeeWKZP8rsLUprh4zV/UZoWABs5GEG1CEe5ScHpEx/CzJ7pU OcaA== X-Gm-Message-State: AOAM531hb3lpyvEXA92SvFBLGOP6o/wvToeT7QaST/2TBhjRNlvcjrTL OyoZhGqJg0CZrcCIULZnxF1Jy08+4GYytw== X-Google-Smtp-Source: ABdhPJwgRuwhQjXtUUhNkhiwIgzdfqR80+WDFEbzU2Ce/sHWCM+ZpnjQluNX4nRFo2wHgH6kXJfPOA== X-Received: by 2002:a17:90a:e60d:: with SMTP id j13mr3512557pjy.61.1599851243899; Fri, 11 Sep 2020 12:07:23 -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 z23sm2979984pfg.220.2020.09.11.12.07.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Sep 2020 12:07:23 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Fri, 11 Sep 2020 12:06:57 -0700 Message-Id: <20200911190701.29171-12-stephen@networkplumber.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200911190701.29171-1-stephen@networkplumber.org> References: <20200911190701.29171-1-stephen@networkplumber.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH 11/15] 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. 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 9a16e198cbf4..95ef436c56eb 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_MAIN); return 0; } -- 2.27.0