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 523E3A04C7; Tue, 15 Sep 2020 17:22:26 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 862FD1C137; Tue, 15 Sep 2020 17:21:00 +0200 (CEST) Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) by dpdk.org (Postfix) with ESMTP id AAB9E1C0DC for ; Tue, 15 Sep 2020 17:20:59 +0200 (CEST) Received: by mail-pl1-f182.google.com with SMTP id y6so1514425plt.9 for ; Tue, 15 Sep 2020 08:20:59 -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=f8HlPT1JltRaRk/amaBzuaIurAJoJM8GvTnvpGltNMmMzcZh+peIfcaRqRHRKCnkbE 1GrbIJwTs7vkJ81tM6ohzlRHitSIj+a9ynwxTS2IENKntH02t0Gcb+X3sknKv/pdVbqw B65uhnzoZH7uRahk3AZ9DNop7X6E9R8WhVx5yQe+OYkAUCivlSYKcJyWlCI6cck44z1p YKDEMnASczo+VNxCH8Q+l19QarZstvNWZChWdO/wu7NpydXto/tmW6Mlw3HvQN5X6Iv4 U8oit1+UYt/PWrTd9meICoFASWxBb8coNAqE6FN1nYOxTQded/7pd0FHM2ce4ENjQdYH gs8A== 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=UH5gJ66oEGa7X0zx3jls01J2VCzWR4/Mz1RnxBIsX8nL4EGBEUbG/Ew0J4Kt11Liwq K/89ylarZyhK3oprONHRrebyNBrYvY4eRp9JLKL8mxnGwZDjMhT+/NXZF/xi9/AObubq oZ01krXgETQSEIuV7bvAFEC2zj0uvJaZp//ncdm9iBdoyVgWUGDWanxjRPxxIZwEqoqV MFxkijRPmznNs3roJRfEwqoSlZ2+QaI/oxG/r9qM31tCqyP+NWdO2ButTuhvZS3qWi7N o14t2mbjahF/AyMeUy1j1+VH97N62L57rgpJsGSSXIgutlkUD7h038togjrSTt7TNwEJ coqw== X-Gm-Message-State: AOAM533k27VuObuVoP/17bWORdgbGm1zWNhSE6sWqVnbu2lRoe5d0L4D 9mgHYQBgMX/zIlfNENNnBu6768P4nZYc9Q== X-Google-Smtp-Source: ABdhPJx+neYhrkvzCF58/uUG1R+OilugApytKwPHWx7ODxpXM+wkqwt5IvzOO+zltTajWJosl6B+jw== X-Received: by 2002:a17:902:b685:b029:d1:e5f8:81e1 with SMTP id c5-20020a170902b685b02900d1e5f881e1mr1958618pls.83.1600182706837; Tue, 15 Sep 2020 08:11:46 -0700 (PDT) Received: from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id c127sm13742278pfa.165.2020.09.15.08.11.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Sep 2020 08:11:45 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Anatoly Burakov Date: Tue, 15 Sep 2020 08:11:11 -0700 Message-Id: <20200915151114.12024-15-stephen@networkplumber.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200915151114.12024-1-stephen@networkplumber.org> References: <20200911190701.29171-1-stephen@networkplumber.org> <20200915151114.12024-1-stephen@networkplumber.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH v3 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