From patchwork Thu Oct 15 22:57:25 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 80995 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 92304A04DB; Fri, 16 Oct 2020 01:00:50 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 1A9351E53F; Fri, 16 Oct 2020 00:58:07 +0200 (CEST) Received: from mail-pl1-f196.google.com (mail-pl1-f196.google.com [209.85.214.196]) by dpdk.org (Postfix) with ESMTP id 1637A1E4BB for ; Fri, 16 Oct 2020 00:58:00 +0200 (CEST) Received: by mail-pl1-f196.google.com with SMTP id b19so207157pld.0 for ; Thu, 15 Oct 2020 15:58:00 -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=Y3aaE9OGA/mZnkFZYNEbYHN9r1yOV/2+5XTLgeuR39Y=; b=TptRGAFNpICA2InrKgNWVBmvcKAVJ1Dyi46PIde1q9hhLJWdPPQd2rLxM6+StFGPpS Xd4C2391bOtmZN2WQGvGxnXFK3nSt8MBIug8cmeNvyQpxo0ZKrAQmKWRB0nyTMGcYB03 i+qwFXfdoypGojvDE72jq8QQ3ipge0ktnymApckC15CPRLa5Fm2JolOH8+tNZLlCk10K YffTyzCky/FpYLp/rdRalxQilbR8N17Zp+8E/YuwBWRWa/hxgXcFoUBDst9yAF4HrBHx yqwFdC/0Rh5MW0pBiZJjNmY1Dta2OqP9m9GcfWvOznsSPT/6p9V5KN8ijQulpsqnWYdE poCA== 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=Y3aaE9OGA/mZnkFZYNEbYHN9r1yOV/2+5XTLgeuR39Y=; b=tH7Dv1Kt5XbxAHObDhFKVEtP0gbnKUnb/44UESIP1amgRCCdC7/GIjXffbZVz5jjAa ZP2E9qttRkS5lMpkVsgoZzAsgYlvhNLD+YsPMvKsRIKejTa1PNSDlpnjWxLgKOiVbM4S wPANpeAICff35pr+SzTQixtVGk6Ljzn/hVuzUjCT9etdJHXfjiV6ssGh5KpRKl38vHpy fXJ4APdKpcZhecoOLHTiDm102WxIRJ0MEqPOe+tfyiYHi/oXZExe/AINqSdB5fQ/IR21 h/GIgVZOvAChry5htx6IvyB0V2e3Pg9g2Hqz8b+xfB+fTc3YlwlHUL0wAwWzwUNHLTjk 1PJA== X-Gm-Message-State: AOAM533QP8rchDzonVr5pipkEZmWKww3ARBI3eQAWwbizkMC5yfIvJQI VyPR8FaR9NZBVAduOzEOuCNJGra6h4YRmg== X-Google-Smtp-Source: ABdhPJwg/ndpvGVV2UJVY1M0/xjaWwCFGVDRiGoJYuiacRl9MCLbEp5H6h3Lp/6sJu2DtiO/58MEow== X-Received: by 2002:a17:902:ee93:b029:d5:c3f7:9718 with SMTP id a19-20020a170902ee93b02900d5c3f79718mr969513pld.20.1602802678867; Thu, 15 Oct 2020 15:57:58 -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.57.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Oct 2020 15:57:57 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Anatoly Burakov Date: Thu, 15 Oct 2020 15:57:25 -0700 Message-Id: <20201015225736.12167-10-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 Subject: [dpdk-dev] [PATCH v7 09/20] 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 273fb1af627a..1cb4718d7e07 100644 --- a/app/test-pmd/cmdline.c +++ b/app/test-pmd/cmdline.c @@ -20109,7 +20109,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 8ccd989562a9..4f8fafbcb02c 100644 --- a/app/test-pmd/config.c +++ b/app/test-pmd/config.c @@ -2929,9 +2929,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 1ead59579bfc..712d9ec70b66 100644 --- a/app/test-pmd/parameters.c +++ b/app/test-pmd/parameters.c @@ -89,7 +89,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 ccba71c07610..21f977cc3f3b 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; @@ -566,7 +566,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; }