From patchwork Tue Sep 15 15:11:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 77745 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 B28B1A04C7; Tue, 15 Sep 2020 17:19:37 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id C4A3D1C124; Tue, 15 Sep 2020 17:19:04 +0200 (CEST) Received: from mail-qv1-f66.google.com (mail-qv1-f66.google.com [209.85.219.66]) by dpdk.org (Postfix) with ESMTP id DAEA91C0CD for ; Tue, 15 Sep 2020 17:19:01 +0200 (CEST) Received: by mail-qv1-f66.google.com with SMTP id cr8so1871363qvb.10 for ; Tue, 15 Sep 2020 08:19:01 -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=4rPShPdSFCQFey5Zcd14Go057sqzNnuaZT8t6i9Ry3A=; b=yfB6nEFTXEZkJ0JLlMOzfn19yze6XFulAisujjmh1w+EFh6SKBlAGaJlfNr/m13ra1 UxpTgpryDROoc7nojAorkjQz1mQPuEW63Ed0jwOa3SExqHOtTbJoOOgLygri87UtbKQm K6+Fg86QqKmG0U+nC7XTQBtJNVK53x1weBJCLnn6jalJgnqJnKnMQrYzJv8zMWwNDz6/ wRY+qwwz/naease/ljMkAhgUa8RU6YFkdJAAg7NpX27SJuLD2N/CtZmG8TjOtrH6DjlK yKIMzBrvo+S5zA7bilrSndMJVz5ww4yXI7w43nO3pQI6v/Ant+PD5JHaa6UA77+Ct2d8 uc2Q== 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=4rPShPdSFCQFey5Zcd14Go057sqzNnuaZT8t6i9Ry3A=; b=j4Fm26QzFK0SziowHWWqMJ+gAkqnUB2KhJ8fhNHs/rlqZBUHTfTy7GSmyUZK35sAzp bAIElPhrSZM9EoHOm15VaUQCPV5+VAJVWJG04Y9jRtCWH0/HZYH2+YEnD/IkxbWRwMWb ELc4dP9PLEQW6Ycgx17o7MUtoChVrX4QbMQ80c5katVJ5TJhHWbG/4z8ji/8FIrjg10s 7Z8dqLlSlwhPEl1vt3CrvG5B+g60mreSxhF66zReXSKt2IukbW/hTiM5b2/ks4xafM0c L0yN4MK+/vFVHpuNTzOSE6yCYdIuFrxGzZLl1e3QW5peoGvUQ9ktAbrZpWxuXAeqc9Qk 37Sg== X-Gm-Message-State: AOAM533j7WuFw61LbUehA31eM0hmLyQl9bDeOVsrockMTa01GZUpb/1G ATMPsMdCOlXHl7gXbC5O2O5jMuXHTXoWjA== X-Google-Smtp-Source: ABdhPJx3u15fJthcZTqOnzwx76GMTPjb9ELObceMCj6b1I/4JmRdq0XP3Xu3U0mU0qKBDVHMQRaHOQ== X-Received: by 2002:a17:902:b682:b029:d1:e5e7:bdeb with SMTP id c2-20020a170902b682b02900d1e5e7bdebmr2235657pls.75.1600182705243; Tue, 15 Sep 2020 08:11:45 -0700 (PDT) Received: from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id c127sm13742278pfa.165.2020.09.15.08.11.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Sep 2020 08:11:44 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Anatoly Burakov Date: Tue, 15 Sep 2020 08:11:10 -0700 Message-Id: <20200915151114.12024-14-stephen@networkplumber.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200915151114.12024-1-stephen@networkplumber.org> References: <20200911190701.29171-1-stephen@networkplumber.org> <20200915151114.12024-1-stephen@networkplumber.org> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v3 13/17] 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 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; }