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 3453DA0350; Sat, 6 Jun 2020 01:01:14 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id CC29E1D63F; Sat, 6 Jun 2020 00:59:19 +0200 (CEST) Received: from mail-pg1-f173.google.com (mail-pg1-f173.google.com [209.85.215.173]) by dpdk.org (Postfix) with ESMTP id 5EDE61D631 for ; Sat, 6 Jun 2020 00:59:17 +0200 (CEST) Received: by mail-pg1-f173.google.com with SMTP id m1so5885408pgk.1 for ; Fri, 05 Jun 2020 15:59: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=3S+xkDI8f28EG+CwcBWEUHD1Qh7kTSyBUHb62kI5mBs=; b=UBtYcG+fi1zll06Yz0yZR8vNmrg15X5ZZNAuRQOZo3diit3rpF4CBIcEzywFk9Lx1V Y6RaoMNTTXn7wWHm2XkM/E5BSg4sHWmQlnHIdDoEpkTwwVjiD3FYYpzln35GBEtscZQi xpvf7778fxVzDPUDgYDXQyBm513PjMgBMasgYpgRKG/lqO8GEfxv7I6m1/m2rZGAGEpM 5PmpsQkyjGJrdpHbtqijHZ1Y5LfzO0Vm2dCaBZBXKt0BDkcF46WRy1OmLTGF+6NQV2HK 3YuRORBYftL22QnTBilpD4TCIB9PSi9Z95ZTdwsZ5luADSDB8YLA2pzaGLigJj9aqPiX ZIWg== 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=3S+xkDI8f28EG+CwcBWEUHD1Qh7kTSyBUHb62kI5mBs=; b=YLk4ocAypyk1WDm7asjf/xpumTMASe5G/uIl6hE38I6edfOqxejoALQT3CUXLyJ6/L 4LVOHWvtUcDoNeLy4C1RQ+Ngm7+tSq0qH/fkyWqmxjzs4GLO1xNxF3gy6pYJO0ZAaUEC txjSPIb/6Ica5XWoHSOzz3Gi03b9XjfAUbd7hPTANBc5UrlPjnsqVtUY7dD92WCqApau ZZD2znQ2NTLIta1tBDnhd9q8fl96QX1uIkoTPLMAf5Fd83uU8D54n94Lm2inugyM38an E+3qJNk4/OMLAK6RqfqZx1qnPd3uLWht3B1q8UHeu2v51gMCugIpTZzJU7XovsfsaIn0 gE4Q== X-Gm-Message-State: AOAM531Ya1hbHZqymQ9HQYSG4/85rDOgAHS1g6fILIgjKMT023fWaR1K jgBnY8KVXFy6xO9RzcS9GRLylg0sMPw= X-Google-Smtp-Source: ABdhPJxTumzQZ2oiZIW1caSIPyGOabwzHnJQ5HutZvcrCQigNFRL+dyXSlaKOfuSoWPZEMSbRC/YHQ== X-Received: by 2002:a63:4705:: with SMTP id u5mr11171733pga.446.1591397955745; Fri, 05 Jun 2020 15:59:15 -0700 (PDT) Received: from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id j186sm543121pfb.220.2020.06.05.15.59.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Jun 2020 15:59:14 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Fri, 5 Jun 2020 15:57:59 -0700 Message-Id: <20200605225811.26342-15-stephen@networkplumber.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200605225811.26342-1-stephen@networkplumber.org> References: <20200604210200.25405-1-stephen@networkplumber.org> <20200605225811.26342-1-stephen@networkplumber.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [RFC v2 14/26] 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; -- 2.26.2