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 86687A04C7; Tue, 15 Sep 2020 17:20:00 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 4CC671C131; Tue, 15 Sep 2020 17:19:09 +0200 (CEST) Received: from mail-oi1-f193.google.com (mail-oi1-f193.google.com [209.85.167.193]) by dpdk.org (Postfix) with ESMTP id 0F36D1C12D for ; Tue, 15 Sep 2020 17:19:07 +0200 (CEST) Received: by mail-oi1-f193.google.com with SMTP id c13so4270963oiy.6 for ; Tue, 15 Sep 2020 08:19: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=RELFVN4LJp/xdGv7GWWLDJ17W+LxdxUr0fMv+CTgyRg=; b=yOonDvozfc0Oinc1ui/AsKo49oN8TmwgGe0xithkAJ/GyVF7FfhOlH3LceYuUR2JBT nVDOesBCelS2zX9eqNouVcl9oeeOROYSiIEJcLRmabIuvV5kSK8aowtfAWQwjkhv04po DtHtxZsu8zQUe9jr7icledpCiux/3enpUVrlshWgABoyf2claxyuxCLKgq+bAQwzu9rv 4h6Qgyx8A5mQomuWOuagECgcRavrC5/ZZGSrGg4Df5LppWs8R+Ka74vrvI+/fbat3wop ScjxEi0vYYWw2fsBGBDvGxxVguK9gYDhPStjAbg995ZWlzDbv/+yClMZGZTRlGCULZFS CeQw== 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=RELFVN4LJp/xdGv7GWWLDJ17W+LxdxUr0fMv+CTgyRg=; b=sgRzd6VQCq0raOw8T2qEZZSMDwrWS0658WAEJKPkCisQQnx+yCicBnTwZl3mDLLGBe 8XYpItJGSfIns1Y0lxk+958Sh9eHoF7P07Z/gxqsrOfDAz2iOPvT9qz0ejc0oMcvEsAy P5CVhlGO38hc52U5YTMfLT1u9ynj50Mo51SulngZQ+85C0CRBx3RUd0ZlgRX/cCmrEcq r2lYyY7qjZrhHFY5YtcVwMV+JNoS5wolRsD5sn314qtVYPSwtQYNY6cicFHgtl7hrd6u KsvhaJ9JhErv9SXI7Y9TdmF9fqbxsOJGwCgEFLH1T4RJ/D5C79Y8U9V90mB/kMuNGXtv 2AbA== X-Gm-Message-State: AOAM532Ghru1NFaQM/PVtg/7/OKEOeKvGwzB+ZrPhVyBFbkLb55lnFpJ adX/zdndZIGWRp+2MA1mZOauBd9QyHLhYw== X-Google-Smtp-Source: ABdhPJzTJGNfnFarA4AOSOUcOx7UmtdNCQRkJBXEgvSd2Zeg5vi7pNHVU4WZaGksxJCdEFYIpDrxPQ== X-Received: by 2002:a17:90a:5609:: with SMTP id r9mr4558594pjf.217.1600182698586; Tue, 15 Sep 2020 08:11:38 -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.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Sep 2020 08:11:37 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Anatoly Burakov Date: Tue, 15 Sep 2020 08:11:06 -0700 Message-Id: <20200915151114.12024-10-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 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH v3 09/17] app/test-pmd: replace master lcore with main 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" Replace wording around main lcore. Acked-by: Anatoly Burakov Signed-off-by: Stephen Hemminger --- app/test-pmd/cmdline.c | 2 +- app/test-pmd/config.c | 4 ++-- app/test-pmd/parameters.c | 2 +- app/test-pmd/testpmd.c | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c index 0a6ed85f3395..966dbb41c667 100644 --- a/app/test-pmd/cmdline.c +++ b/app/test-pmd/cmdline.c @@ -19709,7 +19709,7 @@ cmdline_read_from_file(const char *filename) printf("Read CLI commands from %s\n", filename); } -/* prompt function, called from main on MASTER lcore */ +/* prompt function, called from main on MAIN lcore */ void prompt(void) { diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c index 30bee332481a..1e841f191702 100644 --- a/app/test-pmd/config.c +++ b/app/test-pmd/config.c @@ -2683,9 +2683,9 @@ set_fwd_lcores_list(unsigned int *lcorelist, unsigned int nb_lc) printf("lcore %u not enabled\n", lcore_cpuid); return -1; } - if (lcore_cpuid == rte_get_master_lcore()) { + if (lcore_cpuid == rte_get_main_lcore()) { printf("lcore %u cannot be masked on for running " - "packet forwarding, which is the master lcore " + "packet forwarding, which is the main lcore " "and reserved for command line parsing only\n", lcore_cpuid); return -1; diff --git a/app/test-pmd/parameters.c b/app/test-pmd/parameters.c index 7cb0e3d6ec0a..6d10debc317d 100644 --- a/app/test-pmd/parameters.c +++ b/app/test-pmd/parameters.c @@ -88,7 +88,7 @@ usage(char* progname) printf(" --nb-ports=N: set the number of forwarding ports " "(1 <= N <= %d).\n", nb_ports); printf(" --coremask=COREMASK: hexadecimal bitmask of cores running " - "the packet forwarding test. The master lcore is reserved for " + "the packet forwarding test. The main lcore is reserved for " "command line parsing only, and cannot be masked on for " "packet forwarding.\n"); printf(" --portmask=PORTMASK: hexadecimal bitmask of ports used " diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c index 7842c3b78120..165e35f7e8a4 100644 --- a/app/test-pmd/testpmd.c +++ b/app/test-pmd/testpmd.c @@ -83,7 +83,7 @@ uint16_t verbose_level = 0; /**< Silent by default. */ int testpmd_logtype; /**< Log type for testpmd logs */ -/* use master core for command line ? */ +/* use main core for command line ? */ uint8_t interactive = 0; uint8_t auto_start = 0; uint8_t tx_first; @@ -556,7 +556,7 @@ set_default_fwd_lcores_config(void) } socket_ids[num_sockets++] = sock_num; } - if (i == rte_get_master_lcore()) + if (i == rte_get_main_lcore()) continue; fwd_lcores_cpuids[nb_lc++] = i; } -- 2.27.0