From patchwork Wed Jul 1 19:46:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 72651 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 40D01A0350; Wed, 1 Jul 2020 21:49:09 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 929E91D519; Wed, 1 Jul 2020 21:47:21 +0200 (CEST) Received: from mail-pf1-f195.google.com (mail-pf1-f195.google.com [209.85.210.195]) by dpdk.org (Postfix) with ESMTP id 9E4D01D42B for ; Wed, 1 Jul 2020 21:47:19 +0200 (CEST) Received: by mail-pf1-f195.google.com with SMTP id x72so2006925pfc.6 for ; Wed, 01 Jul 2020 12:47:19 -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=atwxq0PGcDovAnTNLhgwFP4SbM+hXx4hVDfYSho97o8=; b=m29tU35dlVhcaouc8CDIkGwlfI7JyunbOJQuOEwI0bwCbTMVj/rfP6yBXJarCWfB/2 AEWGKobRIMbNYWmrxFHMSgxpKPG4PJQFhMeulAwciq8fYHH5muZAKChJ5CMlZ/bD5q02 UpeS2SEHRxU/BrldaW4ETnx0GZrZDO1YeMsRTXFavzMXBQwaPAU1Vy+rIU3u1yFg9GOS WzQUWvu+7ToA187ygp22wf8fwke8EhDAmJX70G+0ZU7QDAQ2obJatMGUQdJcpHtL+r0p L+v93HmsTGGiwHvh2EPLOdXr5T2R0Zbc4A6EY5lNGkmmOp7CaxG7bu7Ypstbi2FKNoZx Bjow== 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=atwxq0PGcDovAnTNLhgwFP4SbM+hXx4hVDfYSho97o8=; b=XPKqSM2jsNZ24qxSLgjDMDGcIcRtEr8yNJMPljSTqY+Z6cVzceiIWGXoiHeL+rsSFF 2l30U1wOkW9OZaiD4yrwO11XR1MGDmJ/HkoYKaG1D3gaO1mXWwSghOibQ5t9I1r+0pGT aTf7gxN7sJIZoC3tH/DWxibeZIqGv9Etp7mjP3sXeZZGRLp6AMkhWsVGhxEABMaFn+9j Vz1hAg4q0Lo8iyw74K60INg/Ycp0hU3gmaT8Bl1xq+gY5X9m//1trsde7vgwKI+aHYN2 9xYBfKom4o/oLAVF77bzT+rBXyNJSokKkIZfN2+rqKnI3YkrcN6x8RhM7Rm4HY9hif2y s4tA== X-Gm-Message-State: AOAM531sX82yip2oP8qw3n9FjFbFH9jMXLcEySbK+sciQpuGcSQYkQoE fiw91KuJDyqavAtCzanBT7johqY76lE= X-Google-Smtp-Source: ABdhPJxiR8+9a2czBlH2+ecMW/DeLD0feFM0txafEOEHGHUYvYbCSwFdDgY/9v1hqJ9io/0kRjaEWw== X-Received: by 2002:a63:5a60:: with SMTP id k32mr21107725pgm.73.1593632838399; Wed, 01 Jul 2020 12:47:18 -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 n14sm6501870pgd.78.2020.07.01.12.47.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jul 2020 12:47:17 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Wed, 1 Jul 2020 12:46:37 -0700 Message-Id: <20200701194650.10705-15-stephen@networkplumber.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200701194650.10705-1-stephen@networkplumber.org> References: <20200604210200.25405-1-stephen@networkplumber.org> <20200701194650.10705-1-stephen@networkplumber.org> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v3 14/27] examples/performance-thread: replace reference to master 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" Use initial lcore instead. Signed-off-by: Stephen Hemminger --- examples/performance-thread/l3fwd-thread/main.c | 12 ++++++------ examples/performance-thread/pthread_shim/main.c | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/examples/performance-thread/l3fwd-thread/main.c b/examples/performance-thread/l3fwd-thread/main.c index 84c1d7b3a232..ee8c8622ad8e 100644 --- a/examples/performance-thread/l3fwd-thread/main.c +++ b/examples/performance-thread/l3fwd-thread/main.c @@ -2211,7 +2211,7 @@ lthread_rx(void *dummy) /* * Start scheduler with initial lthread on lcore * - * This lthread loop spawns all rx and tx lthreads on master lcore + * This lthread loop spawns all rx and tx lthreads on intial lcore */ static void * @@ -2265,7 +2265,7 @@ lthread_spawner(__rte_unused void *arg) * (main_lthread_master). */ static int -lthread_master_spawner(__rte_unused void *arg) { +lthread_initial_spawner(__rte_unused void *arg) { struct lthread *lt; int lcore_id = rte_lcore_id(); @@ -3765,14 +3765,14 @@ main(int argc, char **argv) #endif lthread_num_schedulers_set(nb_lcores); - rte_eal_mp_remote_launch(sched_spawner, NULL, SKIP_MASTER); - lthread_master_spawner(NULL); + rte_eal_mp_remote_launch(sched_spawner, NULL, SKIP_INITIAL); + lthread_initial_spawner(NULL); } else { printf("Starting P-Threading Model\n"); /* launch per-lcore init on every lcore */ - rte_eal_mp_remote_launch(pthread_run, NULL, CALL_MASTER); - RTE_LCORE_FOREACH_SLAVE(lcore_id) { + rte_eal_mp_remote_launch(pthread_run, NULL, CALL_INITIAL); + RTE_LCORE_FOREACH_WORKER(lcore_id) { if (rte_eal_wait_lcore(lcore_id) < 0) return -1; } diff --git a/examples/performance-thread/pthread_shim/main.c b/examples/performance-thread/pthread_shim/main.c index 18f83059bc17..fa6c52209065 100644 --- a/examples/performance-thread/pthread_shim/main.c +++ b/examples/performance-thread/pthread_shim/main.c @@ -252,10 +252,10 @@ int main(int argc, char **argv) lthread_num_schedulers_set(num_sched); /* launch all threads */ - rte_eal_mp_remote_launch(lthread_scheduler, (void *)NULL, CALL_MASTER); + rte_eal_mp_remote_launch(lthread_scheduler, (void *)NULL, CALL_INITIAL); /* wait for threads to stop */ - RTE_LCORE_FOREACH_SLAVE(lcore_id) { + RTE_LCORE_FOREACH_WORKER(lcore_id) { rte_eal_wait_lcore(lcore_id); } return 0;