From patchwork Fri Sep 11 19:06:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 77473 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 1071FA04C0; Fri, 11 Sep 2020 21:08:19 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 458001C132; Fri, 11 Sep 2020 21:07:22 +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 17A671C125 for ; Fri, 11 Sep 2020 21:07:20 +0200 (CEST) Received: by mail-pg1-f194.google.com with SMTP id s65so6236588pgb.0 for ; Fri, 11 Sep 2020 12:07:20 -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=HlEpxQRO8APObZnTQ+oR7sykFfsd5hdo6KrolmtgIuM=; b=JxOu1p4pBWOj3ERRVX0WM3zPxBycm9hfI0CFaqj1qCF78qT47yytIQd/cLTH4g+47k D3dgl/YLkNhXXmcKPzxC7yP4zV6QB4IPECTghflx2lG3OwVzXGWZmxrISjiNgBEZU5LY FB6lcPKA11A2mSCKsx/FCXRWcZvbCMajxR1Pvp6hAseQsR+agj1TtRg5ByxPjL1EQFwL GyJOIINtl/ZklVc/fZ4B1R5x43njX4isVi8vQYY/1rEpbsa8BqgguSFbzm0rG/QCgO1Z 6K0F4HIKm7v+n3BK8UepsXflZflnDYrcl/3RmYXrJ6Xai83hA8zj7ln2HZT3mYvyopvN Z4ZA== 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=HlEpxQRO8APObZnTQ+oR7sykFfsd5hdo6KrolmtgIuM=; b=cDLg14Fr91XNQs8mbqnJaiP1gfse5FDfd5NYKX7cHmKfQsUDRcK2bUCA9nO52KjgIQ vDSPfgJjtib37p1Oz3F7Q8fysOj9b6gkCws4ZGwYUcZ7navQJCTEuzdTx4X/noibYSPL 7GNC6/d1dHYdbt0SqLLRFKkGoDjo6JmMNTUu+NLDT91uon32YOH/MRbymqxvn9cF2PlZ 9Uu8IjpqgwZcsL++0B+O1xlD//h3Kn9/q+U79f0QJT9WskWr9KShEp1nwy/2qMKYzLpA vW5Xfuquqaat7AdEFiveu9XX3QbbGo1brhc6oQAeJh/KOzvsp8307bopYi5DvoUGr+fd YLng== X-Gm-Message-State: AOAM530TLXl+/Ju3/ZMX9ZM50jNdwXBfdOdRZnuBpsj7meeu7M5XF8Kk XojYTtZa0cRjnhU8QydemfRXBSuvJB3txA== X-Google-Smtp-Source: ABdhPJw2f0F6ub7sWO3yBYFEk1k1I0stSXC49wSiUSoIY5BY2EHJtB2nEMukFdYqYFbdXcIRm8lXug== X-Received: by 2002:aa7:97a8:0:b029:13e:d13d:a105 with SMTP id d8-20020aa797a80000b029013ed13da105mr3321043pfq.33.1599851238837; Fri, 11 Sep 2020 12:07:18 -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.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Sep 2020 12:07:18 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Fri, 11 Sep 2020 12:06:53 -0700 Message-Id: <20200911190701.29171-8-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 Subject: [dpdk-dev] [PATCH 07/15] 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. Signed-off-by: Stephen Hemminger Acked-by: Anatoly Burakov --- app/test-pmd/config.c | 4 ++-- app/test-pmd/parameters.c | 2 +- app/test-pmd/testpmd.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) 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..65c99b6900ae 100644 --- a/app/test-pmd/testpmd.c +++ b/app/test-pmd/testpmd.c @@ -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; }