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 BC163A0350; Wed, 1 Jul 2020 22:27:08 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 842001D58F; Wed, 1 Jul 2020 22:24:36 +0200 (CEST) Received: from mail-pg1-f176.google.com (mail-pg1-f176.google.com [209.85.215.176]) by dpdk.org (Postfix) with ESMTP id B6EAD1D60C for ; Wed, 1 Jul 2020 22:24:34 +0200 (CEST) Received: by mail-pg1-f176.google.com with SMTP id z5so12262451pgb.6 for ; Wed, 01 Jul 2020 13:24:34 -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=eL9iBY15ufBxZsTdeCMVJEk746Tgj0tk/PrcJOdImGc=; b=ids1bRd5E9ib1WRBQrEwk8ozpkGZFfbxypAuEKtCl/xKH9lH13/4jNX0xVO7uPk35m eqyo0ezk4qVNGQeWNoY8UceqEDFKK+K5H5YDzGBEL0oe7U3HLmLs6GteC1vSLQ1N610Q 4PWiHSZ4WzdVu8J7Xapf0L77z6r0znk5HZSkspCzNur0cBt6HpixRUHtJvTcHZ0ya/dv FWeiHETfUnjfhjeFk07Apb/aRmWy5EYwXN/pc++o/EX38/oXpw12wAt/g7jFW1cFSaCK py+90HaLL/CMAncjH0/VK0f59cfAnHz6PBPlmhKgym9iNzfGKVtt3+I2NA2Rk4pz74iL zKCw== 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=eL9iBY15ufBxZsTdeCMVJEk746Tgj0tk/PrcJOdImGc=; b=S0gpWSBFm1Pwu/b+Hsp8K+FcmKRrdyS+yFBuacZmTGm06Ns104ier/ipD4LXQf7ngH 480eQXXTSsmiCbGcazyD5/2Jp6MwzieS50jmflrVbuoLvfqo1XPUw49cLIBMH0DEP9yf CPVxjSjCV/Drpbx113Un4qlv55YWKAZlQVHek805uJumhV+BBFkJuv+QEbRsnZwAAqs3 ekW3Fz0ZX2+lyxoxYuMrQQ6+C5gJ9tMFONz3DZJmI1G3xdD1oWiGn9i0b2GniWExtybf vLhSfR4KN5Dro/MP5Cz3ndHQatkxzh0ALo0zhX/+abM+7GKxQtfSTR/Gxt3h3iwBPlCp dgFA== X-Gm-Message-State: AOAM530eBW92KyRtr7+yIbg9ONcEJyryHvisKsu+t9LmKMPcVIfqa0tx UbbqvuifwFgXAJwG9mpCuxcfn/JqPrQ= X-Google-Smtp-Source: ABdhPJxEAIDzNGrWOQzkiZONCbWtzxuYZzKFq9hFbSQYYBrrgw2D8dtJyaIcaEDG0QgMtLpQixvVBA== X-Received: by 2002:a63:e744:: with SMTP id j4mr12860246pgk.416.1593635073427; Wed, 01 Jul 2020 13:24:33 -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 g8sm6584803pgr.70.2020.07.01.13.24.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jul 2020 13:24:32 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Wed, 1 Jul 2020 13:23:51 -0700 Message-Id: <20200701202359.17006-20-stephen@networkplumber.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200701202359.17006-1-stephen@networkplumber.org> References: <20200604210200.25405-1-stephen@networkplumber.org> <20200701202359.17006-1-stephen@networkplumber.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH v4 19/27] test-eventdev: replace references to slave with worker lcores 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" Use new API terminolgy 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 | 8 ++++---- 4 files changed, 19 insertions(+), 19 deletions(-) diff --git a/app/test-eventdev/evt_options.c b/app/test-eventdev/evt_options.c index c60b61a904b0..e09a0592673f 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("initial lcore", "%d", rte_get_initial_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..4082e2f210f8 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 + 1 initial lcore */ 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_initial_lcore())) { + evt_err("worker lcores overlaps with initial 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_initial_lcore()) { + evt_err("producer lcore and initial 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..752603803b25 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 + 1 initial lcore when producer cores are used + * Else N worker + 1 initial lcore 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_initial_lcore())) { + evt_err("worker lcores overlaps with initial 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_initial_lcore())) { + evt_err("producer lcores overlaps with initial 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..00ec3dad6bf7 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; @@ -107,7 +107,7 @@ pipeline_opt_check(struct evt_options *opt, uint64_t nb_queues) { unsigned int lcores; /* - * N worker + 1 master + * N worker + 1 initial lcore */ lcores = 2; @@ -129,8 +129,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_initial_lcore())) { + evt_err("worker lcores overlaps with initial lcore"); return -1; } if (evt_has_disabled_lcore(opt->wlcores)) { -- 2.26.2