From patchwork Wed Jul 1 20:23:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 72679 X-Patchwork-Delegate: thomas@monjalon.net 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 6081DA0350; Wed, 1 Jul 2020 22:26:25 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 248001D5F5; Wed, 1 Jul 2020 22:24:30 +0200 (CEST) Received: from mail-pg1-f195.google.com (mail-pg1-f195.google.com [209.85.215.195]) by dpdk.org (Postfix) with ESMTP id BCD1E1D5E8 for ; Wed, 1 Jul 2020 22:24:27 +0200 (CEST) Received: by mail-pg1-f195.google.com with SMTP id z5so12262323pgb.6 for ; Wed, 01 Jul 2020 13:24:27 -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=rWPr0ixzTFGviF0JADD2zrh1aWK+qjZOZqIqDyZBzEA=; b=lg8YIACrNYu0Ruj8R68G9hjoIY9j7ura1jAVTNR18lxb3FwwdsLcJA7b2Jnmx/BhNQ WoqNZNEfjPh9XK+gHLACGT9HIKR6dIhceykhRP9dtUpirCVh8PLb2S3en/yy+lO3Ams6 mjvXcpzJEX7+Mu4UtdHkg/+CZj7A79yC9X0KnMR4UzrE/hXJWxdHiCjxXkp0xTaK6YmN FzZvY+JL4L0UMW7c6ifNOnN3yxHf0mp0kZLEKmG7iC7RFCzo49ZUzQoAxmrP+jYBB0q2 Y4WLI8HHNpI6IY0SC2/xzFY1Dv8i6Be9l0QCQp6zINLRNgr25GcSwgoZBhECZjhvv666 mj4g== 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=rWPr0ixzTFGviF0JADD2zrh1aWK+qjZOZqIqDyZBzEA=; b=XNt7M5cS6aGaKp9fELcQn6UjDyNoC4PKvuxTy3O8Vetaa0qB4qt+e52/sCjNd1swwC OPPHOSymiVHBuTnEIN06mSpHnyPk11xJ3AP4mb1LRZJ86SfnKanqOOfVUmTIw4Y0U/yr CYuWLCu2oyqUMhkmKXvaL+znINusBCwKjUKap23Fw+iq+3BU0L6/4jaPHUv2KlYqJAl7 8rHizMSq/0wqYLIdTFnSiQQHVl3jyiXTDwsqsAgkZ7n/fTSjd3mytQLh+KyCq3G3g62z sL742cSq4XeQXmXcCPWFovgBn97iVYyJBVe4l2DAVDkBwuFF4VlKBoImiteo5mWipzE6 0jaQ== X-Gm-Message-State: AOAM531QYAaXCgmqTUUSq3A9Te+xHYLeU1u2m3mRN9sRnMxc6RO+3a7b I9ASnqG+m8OpYUk5ni/vHNotMxlhzLE= X-Google-Smtp-Source: ABdhPJxuOqea3LiopBqUh57Se7+Y/NENibYFF5t/1hd/ubWYYrf7oS+g8bH2bzZQExHmS9sTj8q8jw== X-Received: by 2002:a65:4209:: with SMTP id c9mr21532045pgq.445.1593635066599; Wed, 01 Jul 2020 13:24:26 -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.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jul 2020 13:24:25 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Wed, 1 Jul 2020 13:23:46 -0700 Message-Id: <20200701202359.17006-15-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 Subject: [dpdk-dev] [PATCH v4 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 Acked-by: Anatoly Burakov --- 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..a23bb021ce6b 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 initial 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;