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 1E257A04C7; Mon, 14 Sep 2020 20:22:42 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id BC3DF1C1AA; Mon, 14 Sep 2020 20:20:38 +0200 (CEST) Received: from mail-pj1-f45.google.com (mail-pj1-f45.google.com [209.85.216.45]) by dpdk.org (Postfix) with ESMTP id 99E891C138 for ; Mon, 14 Sep 2020 20:20:30 +0200 (CEST) Received: by mail-pj1-f45.google.com with SMTP id md22so5481276pjb.0 for ; Mon, 14 Sep 2020 11:20:30 -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=ngiybHFSD4B2ltePQAj7AdrQ4brv8rHsRGYtz8eg73g=; b=gPCgJI6LVBMxMxjVVkVjnLtq2tlmoYxidDH6DkOuRFpUK5zsgT5J9rNKYCoLCqciBx brTSKpTPQdhIAnnyUqptLXaJce9xNfhYldhta6jRpTND02V8c65WuGorr69vqdcktlqI BnwIpo9BED1if9F3vAXbx8F6+xbarG61HUB09nC5OuNcDwcP5Tf0xkXpnKD9t4XIuK6N nj1ZsdzfPLkWGhoyj604X/JduXxjZAy9LbS+klC7BkN5CatGI9DLJSQUjCUCJGKwO3Zq 7APzHMm7brWeROSOACE/bYk9H6RZ/XYu9oZAf6GlgMAJlWATG76/DWRsC7FzjrOnPUBE 6qQw== 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=ngiybHFSD4B2ltePQAj7AdrQ4brv8rHsRGYtz8eg73g=; b=n/RObPuZ9X59s0M9jhVJMWP2G+2gVBbhSQfq7o2XgTupltAEHV0/CxL1yhvxVQT9Gq fC+U69heaSkdFs8Vt5qNoqnsLEH1sBUfgXZkFUQrXm+4gHyCEO5E8XcifI6MujQlr9Y3 tuTS6kJkAgFEvH5tDDYWkVu0ulAfVOs/BsCRqYMnfST1BALO21/XMYMKNIOqCwm1fLIY QflhuqR9sL3+z1tY88HA7vcTbJKitc6s/AXNQx22R4RLjOA9TW2lzmi2eA4Ea8Fr/CB5 qkszgdBgy1Nd3q03T4ixJuZu/gMI++MBFXnUxWdP5alFL5z+vnqdsXrLSusjiy8dc3Sf XtcA== X-Gm-Message-State: AOAM532ZJu1ZaRKPok4jMTWz+MCEDWHgY5Afjo2ySUNV55dbs02N53jM kN52yiY3an2aOrW7xLg5TxljDXcamTRsPg== X-Google-Smtp-Source: ABdhPJy9tQ7yZo1eUcAVbxwAYhXdtjQb6eE35sZSFoHS/xWrUgvW50syXGUlqVucUF2fBsu/fK/SQA== X-Received: by 2002:a17:90a:d704:: with SMTP id y4mr568307pju.159.1600107629363; Mon, 14 Sep 2020 11:20:29 -0700 (PDT) Received: from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id u6sm9952728pjy.37.2020.09.14.11.20.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Sep 2020 11:20:28 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Anatoly Burakov Date: Mon, 14 Sep 2020 11:19:59 -0700 Message-Id: <20200914182002.6750-15-stephen@networkplumber.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200914182002.6750-1-stephen@networkplumber.org> References: <20200911190701.29171-1-stephen@networkplumber.org> <20200914182002.6750-1-stephen@networkplumber.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH v2 14/17] 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" Replace term master with main here. Acked-by: Anatoly Burakov Signed-off-by: Stephen Hemminger --- examples/performance-thread/l3fwd-thread/main.c | 16 ++++++++-------- examples/performance-thread/pthread_shim/main.c | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/examples/performance-thread/l3fwd-thread/main.c b/examples/performance-thread/l3fwd-thread/main.c index e32802aa9b8b..c0060fd79421 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 main lcore */ static void * @@ -2261,11 +2261,11 @@ lthread_spawner(__rte_unused void *arg) } /* - * Start master scheduler with initial lthread spawning rx and tx lthreads - * (main_lthread_master). + * Start main scheduler with initial lthread spawning rx and tx lthreads + * (main_lthread_main). */ static int -lthread_master_spawner(__rte_unused void *arg) { +lthread_main_spawner(__rte_unused void *arg) { struct lthread *lt; int lcore_id = rte_lcore_id(); @@ -3762,14 +3762,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_MAIN); + lthread_main_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_MAIN); + 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..23e3b5e311cd 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_MAIN); /* 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.27.0