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 A584FA04BC; Fri, 9 Oct 2020 23:43:51 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 1A55E1D62C; Fri, 9 Oct 2020 23:39:32 +0200 (CEST) Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com [209.85.210.169]) by dpdk.org (Postfix) with ESMTP id 5170A1D5EA for ; Fri, 9 Oct 2020 23:39:22 +0200 (CEST) Received: by mail-pf1-f169.google.com with SMTP id x22so7914156pfo.12 for ; Fri, 09 Oct 2020 14:39:22 -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=3hToSXxpMAQDsMSbvhwDoKaxfWQfQn+SRqp0xCu+ObY=; b=hWeyHjsOsBY6WGAMkxuXVnrf1fXi5hWuC+REqVxpBj2TreaFCYst/FgPG8d1KMeVq4 a6P3/wxL6f14i1U0MUIlo2joKi+lS64u14bEzIdBSzgleUmXED33b5tv9bpFX6YN4cDo oejbSyR0h7/Y+dKHTZMW81w7PyehZeHqDDSit00AegeJgnTX21nBegL7mKye7ShcAQl7 uFey0HK4Gg0QD2woWy0369N9cIdhirtBnLKZ2u6g3MNz5FrZbycU6FWMnZr2R5RhHpSz rNPxQdn8lsxuhCJkLiACYYEdHZp+v+tVWAvspyiNzE9PJAanbaFAZkhDmAPWQTm///6t kt8Q== 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=3hToSXxpMAQDsMSbvhwDoKaxfWQfQn+SRqp0xCu+ObY=; b=HBg9+aSt2abXzywK49zqqCwhGxthKEimO8V1pc7QCCT3djJXeVSYMDwA/tc6R2pQ7b 4te1awUbZeLRn752cIOKAtfA+yE4KgCP4RARJaxl7waveEri6dtKeyZ9BrU3Njoe21+X pnhi3I38F9HivHaRD9pNJ6KlUqwvnEPP7iP5LilMsoKn23I1cHMLwQMquKVbydeQ91bJ x3vodCwdgA9znc4dXdwaQ3OKzPSVP6okil8oqdShHWk0YLz5b621pcgCPt0E5O/e05tg 8zGXJ+FkR97tQ0s18Y7QqO0UjRu1i8eBUFasAYw4wDOJ7rTGsufFNIoO0YkOZQc14AdY Jq6w== X-Gm-Message-State: AOAM532a6IUgkEz20weLcUnwUWJ3HJayxJMLHf//E9jb8j0wnsQ0Qo3q WwdUR+R36a8XND5/eknbHu7rs6lGPHdWSw== X-Google-Smtp-Source: ABdhPJzZ1u5c0QmIE1aOk1dFhzFrdNhMJL48OE/ZD3Kw3Ks8H2Lf1Bb4akZHWBp/PCT6VoH7mnnNuA== X-Received: by 2002:a63:4811:: with SMTP id v17mr4843330pga.253.1602279560252; Fri, 09 Oct 2020 14:39:20 -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 x18sm12173381pfj.90.2020.10.09.14.39.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Oct 2020 14:39:19 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Anatoly Burakov Date: Fri, 9 Oct 2020 14:38:52 -0700 Message-Id: <20201009213855.17933-15-stephen@networkplumber.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201009213855.17933-1-stephen@networkplumber.org> References: <20200911190701.29171-1-stephen@networkplumber.org> <20201009213855.17933-1-stephen@networkplumber.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH v4 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 818e483d2faa..e96076f2903e 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(); @@ -3759,14 +3759,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