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 3A26AA04B7; Tue, 13 Oct 2020 17:30:29 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id B17801DD5B; Tue, 13 Oct 2020 17:27:19 +0200 (CEST) Received: from mail-pg1-f196.google.com (mail-pg1-f196.google.com [209.85.215.196]) by dpdk.org (Postfix) with ESMTP id E7DF11DD55 for ; Tue, 13 Oct 2020 17:27:17 +0200 (CEST) Received: by mail-pg1-f196.google.com with SMTP id x16so17787924pgj.3 for ; Tue, 13 Oct 2020 08:27:17 -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=FLepOhvlVS0lOgVAU5YuyBfGbhYXPZyhwdUOnt7fJuCNqw59kdvSS1D6OrkjI9qhJH dmmbdcI69KyIyUt+fWLVUHkHloPT7YkKHpklQkpM4zexkwS6kmFU2JrasKErMPspGsww WbmnXk4MPeciFtapIpg2fZ8bTWEu0CzybsiaFMNsFJqbpCgLwXTTYCD6E27kkDwrE5XE OCo75NIv8uWbSkvB5F4a/mXkeTa7mEN361/eDc9Tfy4zn5HvDm+JEj+epi1bqlKJ+her VruH4nk6rKdeB9FjccQ0vALxqVC+4prHMu4BHU9vRjy7IGO8mWtkvEvGqcWBw3S60YEh NYhQ== 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=PE/mPgtAJGVJUmDz6ZMLOHNAlUJ9STUHWDbptPLb+Y6rMh0pnwBgnQOqV9t9FJ+RQc 8DThpf7oelfSUddc46MOs4nbus35ui481CZ8T9qrm/Koi1nIobugp4k6Ei95vAKRb86g xf+ucqGKxZtgmKVkXt990njG+IQJnDaUA7sNDiGWAdpG8Gz27CjxAbT2qYcjjPc78i8U C2WUZN8kGcxZG27uNBH8PFDjgLb9LK8cPc7MAgfnWOJzVbP1HvCw6boi7mFeOiMMwsgB oqhGWsLVnXOBbn27rdEI9l/7SukhwrlCyEq9p3dWE+rXLW5Xska/JNKwcSgfAhBmg38O Jt/Q== X-Gm-Message-State: AOAM53026kMTJfsL9btlGO5TObqHzbbQ0ELQAZLi7zQ/Yf48ORR4AB6r 5M33CzeYR98y+78GpD+cMgVtvJkQSUeA1Q== X-Google-Smtp-Source: ABdhPJzKXEsEuLiEbRRghbuuyJdGqwici8XTeG8PtW09S/UmcnFdhetU4sqzUI9gtayLglbmMH5jYA== X-Received: by 2002:aa7:97ba:0:b029:152:879f:4789 with SMTP id d26-20020aa797ba0000b0290152879f4789mr210958pfq.81.1602602834654; Tue, 13 Oct 2020 08:27:14 -0700 (PDT) Received: from hermes.local (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id z12sm23815233pfr.197.2020.10.13.08.27.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Oct 2020 08:27:08 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Anatoly Burakov , Wenzhuo Lu , Beilei Xing , Bernard Iremonger Date: Tue, 13 Oct 2020 08:26:01 -0700 Message-Id: <20201013152610.2589-10-stephen@networkplumber.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201013152610.2589-1-stephen@networkplumber.org> References: <20200914182002.6750-1-stephen@networkplumber.org> <20201013152610.2589-1-stephen@networkplumber.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH v5 09/18] 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; } -- 2.27.0