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 5ABC6A04B7; Tue, 13 Oct 2020 17:30:52 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 0DDE61D57B; Tue, 13 Oct 2020 17:27:25 +0200 (CEST) Received: from mail-pg1-f182.google.com (mail-pg1-f182.google.com [209.85.215.182]) by dpdk.org (Postfix) with ESMTP id 158C21DD49 for ; Tue, 13 Oct 2020 17:27:23 +0200 (CEST) Received: by mail-pg1-f182.google.com with SMTP id n9so17767530pgf.9 for ; Tue, 13 Oct 2020 08:27:23 -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=gG27nr8A0/ucTWlgrf6+k8jCk/qbnAvYCs/azLLqGFJIAY3CGX2ytCU7zBUEmvtiUz h7Okrpqb32F530bi8GRYBfYJIHKqn15f7jMEgpqw42ILxVOrA0ph9ssNHIZ0XHStcEDa 7niPReXy2ysK8q503PfTPDFa3IZMsRFFqUoKicl1bdlb8ug2qZljd/ygcmPVLaGruoxb 9OBB0R/4bHCpg3xbgX4c0soTvaM4POV84jRENlh8KgZLkcO121tmrhkyFHfSlCsaenYe uC3ZBLniyDJcb2TOJDUYx8Cd4rTA0QqNbTZS0DHZ+4JtgS21WxpeTGRQ4BphDpJOAFqt yDtA== 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=BMKSC6W+H5ogBwqTxRu++OW0u2YI0aE/ZrHinkC83uceYu434qXQTSNF2Hc7oDt7DX n0grtSAZtHdRkv4V9ac4M8FbLz/QLeu4L58E8jwYZzFJw6ZJL9mojsLobycdyRGmWBw4 Bmt0Cqs11Df8FanJ62BigXN2igSRyJqocbodB9vM8yZ2Dgp7gbjEtIxoNkGvY5ZFvp03 tUuzyUCIkXWYJ1XPGfV4Xwld22xf0Uwr20zGU/JWIeXl9rdQCc78FNAygPrIus5eEiJi GsFU9rsb8zyRsHMyJ+Kak803Dk31NDaqbSd5u+YRdyj1lWuf7w7cOLJOOh5F4kQg8xwD anhA== X-Gm-Message-State: AOAM530TerVTQEpSdrBVIQIEJFXhd6HvbMXX4qbnLfrwpNCZFB08jo0M 49ur0QlBmDyhGuR4BHHcEz14MCwQyECUKA== X-Google-Smtp-Source: ABdhPJwgVuN+8hPu0PR03uK6jf1Wf+eikkIn9GqqS21eYtm28CbAtQ34Lrs5S0ohtzErmfau6EDtiQ== X-Received: by 2002:a05:6a00:7d6:b029:152:3ccb:bc9e with SMTP id n22-20020a056a0007d6b02901523ccbbc9emr144936pfu.57.1602602840067; Tue, 13 Oct 2020 08:27:20 -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.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Oct 2020 08:27:16 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Anatoly Burakov , Jerin Jacob Date: Tue, 13 Oct 2020 08:26:02 -0700 Message-Id: <20201013152610.2589-11-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 10/18] 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Replace master with main lcore. Acked-by: Anatoly Burakov Signed-off-by: Stephen Hemminger --- 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