From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from dpdk.org (dpdk.org [92.243.14.124])
by inbox.dpdk.org (Postfix) with ESMTP id 4722FA04BC;
Fri, 9 Oct 2020 23:42:36 +0200 (CEST)
Received: from [92.243.14.124] (localhost [127.0.0.1])
by dpdk.org (Postfix) with ESMTP id 8236A1D5F2;
Fri, 9 Oct 2020 23:39:25 +0200 (CEST)
Received: from mail-pg1-f177.google.com (mail-pg1-f177.google.com
[209.85.215.177]) by dpdk.org (Postfix) with ESMTP id 6BB721D5C0
for <dev@dpdk.org>; Fri, 9 Oct 2020 23:39:17 +0200 (CEST)
Received: by mail-pg1-f177.google.com with SMTP id u24so8306561pgi.1
for <dev@dpdk.org>; Fri, 09 Oct 2020 14:39: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=wbswMm41oESrSRFS3FILbDd/tMu65rFM7dxlEf3D9iA=;
b=rqQDJdluWF2YDzFxpFYZeMOIKUFYpFJcy3sm/3AHzoFRwEu/4CMZnd08MuxLH9RNoF
E9pH8hEVuUJl9pOFpzVrTxj8/TLkuTGiqdTwT3HN7la6fxDANBkMbdhLuVG6kZliCWdU
UVcwGl1YwzT6OKPqPlWeM1mJv5J8hdZL0+0l2Na8aPblAigLzs+OUgKhtNEcRHgh/TvG
VDcFyPeTn2TwzvPJumOsMx89++BhXvAW7/7QjdzwQjAK/BZvKVbQKkJs1u633qW+s5ZX
vBRjHK6qocvz7oIdX4O258Y0QLdOw1zJlge9ZFyigstRps//c5ijgEfB/JkvUmUMnyQG
zbbQ==
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=wbswMm41oESrSRFS3FILbDd/tMu65rFM7dxlEf3D9iA=;
b=QfIgsAbQOheWAJodTuvkhtQNnguBKMcr8MS5WxUgV165yekiVgwGbmWZ1bEFTvKQ2u
H+yrL5PGjijuXwGfz/Rd6jxMxMGxSI5C1vbFIklldDdREjc5+DyQceI7BJJtG/zLEen7
4NR+Bmm3kGU/vHob6TXBffK7HVnUE7cPCkaMli+5R9Nev0g8O7lyr3ltu6PaWiBcTaRU
vMHmKUoxQTpfeBQbTmUbLEsk7Zq/9Act1q2JVQsznPHSGOI6T9SZ+Ioj9vAhn/fWUd22
OLkUFrJUwDGP6lnpl74xPhjs2HFaKmYMIo1fA8r+UaHbcU2WRQyC+Y/GAkbdCij6S2Xq
PxRw==
X-Gm-Message-State: AOAM532HpWB24y4CY3HzYhmys+0R5eiZf5GusLJsLEDRBgqVpWRo0LV9
+XxIvUL7YPewCrD/+PabI3W+lM6UmuSMnw==
X-Google-Smtp-Source: ABdhPJz+sp0CW09LmEl07Hv0rfTRJyznNRih5c6bvNzefp6LfPiNPObJ/jXDYUBKqq2Vq3wkukRjuA==
X-Received: by 2002:a63:c20f:: with SMTP id b15mr4927861pgd.8.1602279555305;
Fri, 09 Oct 2020 14:39:15 -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 x18sm12173381pfj.90.2020.10.09.14.39.14
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Fri, 09 Oct 2020 14:39:14 -0700 (PDT)
From: Stephen Hemminger <stephen@networkplumber.org>
To: dev@dpdk.org
Cc: Stephen Hemminger <stephen@networkplumber.org>,
Anatoly Burakov <anatoly.burakov@intel.com>
Date: Fri, 9 Oct 2020 14:38:48 -0700
Message-Id: <20201009213855.17933-11-stephen@networkplumber.org>
X-Mailer: git-send-email 2.27.0
In-Reply-To: <20201009213855.17933-1-stephen@networkplumber.org>
References: <20200911190701.29171-1-stephen@networkplumber.org>
<20201009213855.17933-1-stephen@networkplumber.org>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: [dpdk-dev] [PATCH v4 10/17] app/test-eventdev: replace use of
master lcore with main lcore
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Sender: "dev" <dev-bounces@dpdk.org>
Replace master with main lcore.
Acked-by: Anatoly Burakov <anatoly.burakov@intel.com>
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
---
app/test-eventdev/evt_options.c | 2 +-
app/test-eventdev/test_order_common.c | 12 ++++++------
app/test-eventdev/test_perf_common.c | 16 ++++++++--------
app/test-eventdev/test_pipeline_common.c | 11 +++++------
4 files changed, 20 insertions(+), 21 deletions(-)
diff --git a/app/test-eventdev/evt_options.c b/app/test-eventdev/evt_options.c
index c60b61a904b0..6994ac453c8c 100644
--- a/app/test-eventdev/evt_options.c
+++ b/app/test-eventdev/evt_options.c
@@ -438,7 +438,7 @@ evt_options_dump(struct evt_options *opt)
evt_dump("verbose_level", "%d", opt->verbose_level);
evt_dump("socket_id", "%d", opt->socket_id);
evt_dump("pool_sz", "%d", opt->pool_sz);
- evt_dump("master lcore", "%d", rte_get_master_lcore());
+ evt_dump("main lcore", "%d", rte_get_main_lcore());
evt_dump("nb_pkts", "%"PRIu64, opt->nb_pkts);
evt_dump("nb_timers", "%"PRIu64, opt->nb_timers);
evt_dump_begin("available lcores");
diff --git a/app/test-eventdev/test_order_common.c b/app/test-eventdev/test_order_common.c
index 4190f9ade82b..24ee6957bf9e 100644
--- a/app/test-eventdev/test_order_common.c
+++ b/app/test-eventdev/test_order_common.c
@@ -74,15 +74,15 @@ order_opt_check(struct evt_options *opt)
return -1;
}
- /* 1 producer + N workers + 1 master */
+ /* 1 producer + N workers + main */
if (rte_lcore_count() < 3) {
evt_err("test need minimum 3 lcores");
return -1;
}
/* Validate worker lcores */
- if (evt_lcores_has_overlap(opt->wlcores, rte_get_master_lcore())) {
- evt_err("worker lcores overlaps with master lcore");
+ if (evt_lcores_has_overlap(opt->wlcores, rte_get_main_lcore())) {
+ evt_err("worker lcores overlaps with main lcore");
return -1;
}
@@ -117,8 +117,8 @@ order_opt_check(struct evt_options *opt)
}
/* Validate producer lcore */
- if (plcore == (int)rte_get_master_lcore()) {
- evt_err("producer lcore and master lcore should be different");
+ if (plcore == (int)rte_get_main_lcore()) {
+ evt_err("producer lcore and main lcore should be different");
return -1;
}
if (!rte_lcore_is_enabled(plcore)) {
@@ -245,7 +245,7 @@ order_launch_lcores(struct evt_test *test, struct evt_options *opt,
int wkr_idx = 0;
/* launch workers */
- RTE_LCORE_FOREACH_SLAVE(lcore_id) {
+ RTE_LCORE_FOREACH_WORKER(lcore_id) {
if (!(opt->wlcores[lcore_id]))
continue;
diff --git a/app/test-eventdev/test_perf_common.c b/app/test-eventdev/test_perf_common.c
index b3af4bfecaff..955edb752671 100644
--- a/app/test-eventdev/test_perf_common.c
+++ b/app/test-eventdev/test_perf_common.c
@@ -254,7 +254,7 @@ perf_launch_lcores(struct evt_test *test, struct evt_options *opt,
int port_idx = 0;
/* launch workers */
- RTE_LCORE_FOREACH_SLAVE(lcore_id) {
+ RTE_LCORE_FOREACH_WORKER(lcore_id) {
if (!(opt->wlcores[lcore_id]))
continue;
@@ -268,7 +268,7 @@ perf_launch_lcores(struct evt_test *test, struct evt_options *opt,
}
/* launch producers */
- RTE_LCORE_FOREACH_SLAVE(lcore_id) {
+ RTE_LCORE_FOREACH_WORKER(lcore_id) {
if (!(opt->plcores[lcore_id]))
continue;
@@ -541,8 +541,8 @@ perf_opt_check(struct evt_options *opt, uint64_t nb_queues)
{
unsigned int lcores;
- /* N producer + N worker + 1 master when producer cores are used
- * Else N worker + 1 master when Rx adapter is used
+ /* N producer + N worker + main when producer cores are used
+ * Else N worker + main when Rx adapter is used
*/
lcores = opt->prod_type == EVT_PROD_TYPE_SYNT ? 3 : 2;
@@ -552,8 +552,8 @@ perf_opt_check(struct evt_options *opt, uint64_t nb_queues)
}
/* Validate worker lcores */
- if (evt_lcores_has_overlap(opt->wlcores, rte_get_master_lcore())) {
- evt_err("worker lcores overlaps with master lcore");
+ if (evt_lcores_has_overlap(opt->wlcores, rte_get_main_lcore())) {
+ evt_err("worker lcores overlaps with main lcore");
return -1;
}
if (evt_lcores_has_overlap_multi(opt->wlcores, opt->plcores)) {
@@ -573,8 +573,8 @@ perf_opt_check(struct evt_options *opt, uint64_t nb_queues)
opt->prod_type == EVT_PROD_TYPE_EVENT_TIMER_ADPTR) {
/* Validate producer lcores */
if (evt_lcores_has_overlap(opt->plcores,
- rte_get_master_lcore())) {
- evt_err("producer lcores overlaps with master lcore");
+ rte_get_main_lcore())) {
+ evt_err("producer lcores overlaps with main lcore");
return -1;
}
if (evt_has_disabled_lcore(opt->plcores)) {
diff --git a/app/test-eventdev/test_pipeline_common.c b/app/test-eventdev/test_pipeline_common.c
index 17088b1b48e4..4ac41a9ad1e3 100644
--- a/app/test-eventdev/test_pipeline_common.c
+++ b/app/test-eventdev/test_pipeline_common.c
@@ -60,7 +60,7 @@ pipeline_launch_lcores(struct evt_test *test, struct evt_options *opt,
int port_idx = 0;
/* launch workers */
- RTE_LCORE_FOREACH_SLAVE(lcore_id) {
+ RTE_LCORE_FOREACH_WORKER(lcore_id) {
if (!(opt->wlcores[lcore_id]))
continue;
@@ -106,9 +106,8 @@ int
pipeline_opt_check(struct evt_options *opt, uint64_t nb_queues)
{
unsigned int lcores;
- /*
- * N worker + 1 master
- */
+
+ /* N worker + main */
lcores = 2;
if (opt->prod_type != EVT_PROD_TYPE_ETH_RX_ADPTR) {
@@ -129,8 +128,8 @@ pipeline_opt_check(struct evt_options *opt, uint64_t nb_queues)
}
/* Validate worker lcores */
- if (evt_lcores_has_overlap(opt->wlcores, rte_get_master_lcore())) {
- evt_err("worker lcores overlaps with master lcore");
+ if (evt_lcores_has_overlap(opt->wlcores, rte_get_main_lcore())) {
+ evt_err("worker lcores overlaps with main lcore");
return -1;
}
if (evt_has_disabled_lcore(opt->wlcores)) {
--
2.27.0