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 72AE9A04DB; Fri, 16 Oct 2020 01:02:59 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id DCFAD1E86E; Fri, 16 Oct 2020 00:58:20 +0200 (CEST) Received: from mail-pf1-f171.google.com (mail-pf1-f171.google.com [209.85.210.171]) by dpdk.org (Postfix) with ESMTP id 5FE071E540 for ; Fri, 16 Oct 2020 00:58:08 +0200 (CEST) Received: by mail-pf1-f171.google.com with SMTP id 144so332204pfb.4 for ; Thu, 15 Oct 2020 15:58:08 -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=rlqwfQSCOewWQdq0qltqZP9uppyQXnR64qoTF8qBT8tC4u8mYvECaGwAs8a81KXpkD TGvO8E7Ia6XFmyjq1gj+gPBpMaPly8XmVJMzXWW8QPXUp8N99iULJGtCRsW29Uwwauzx +1xaVpzkB5aFVb6coYmrcptrSdiKVDJ0goAH34tcJGITYmZSD6E2vpsrgsU6huI9mpKW 1AYnzPyzaMK4vqgCiGG+tcKgbeD22lMbAE0mfzaizx2K6Mn+2Q9Yf8t5Ju1RVeuEB5C3 g/kcAFTaIKZlXlZZT+nq1xEzAMtl9ODaC5NuTloxy9AH8elwZ40DHj39NqPdUdUIZXGg l+PA== 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=CUSgorG7NOfcaVb0NoiY/tyJuJZanw8rZtTqJMyMufCIJ7gJjhxtPrDc8qWsOLknu9 fmJ07lRMdaj+8Bbd/+UutQWqQH5UQj4FSfLDypnYGtkOuBoPtqQdSX1+VVVhSCPqRFUY zeT2Vt+r+7v9NdpQfFoWGgql+XBlKR5ZdOt7aNgmCU5r1RWNrsaR+2hHaAitxtHHcuEx mtKxBFnmJaFfRMx/EsQ8H+kEUActcOPCT048sTwES7NoZjpIi12jXLC3nr6FQIjRWQGa 12sAE9haGVWeRI3xt93OFiz4dNUmfcDIQoS0ptReWSF6/W5jLnMq35EP8IgI99CnXVpn pH8A== X-Gm-Message-State: AOAM5300hiaIfrMZhr+7sekEYKjnFIwiy2TPNfA0OgXHeWBCBApkkd/j QpKqoZewWubPFTNs27am1LWeX+mK1TI2iA== X-Google-Smtp-Source: ABdhPJy/KdAvatxcAfIM3hX/kMCvZgale1sdmpKsaFJLywQW6RFdXnc8hVEr2tXqj5b8sFuHRBS1rw== X-Received: by 2002:a62:b506:0:b029:155:d56e:5193 with SMTP id y6-20020a62b5060000b0290155d56e5193mr849788pfe.52.1602802686121; Thu, 15 Oct 2020 15:58:06 -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 x4sm324055pfm.86.2020.10.15.15.58.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Oct 2020 15:58:05 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Anatoly Burakov Date: Thu, 15 Oct 2020 15:57:30 -0700 Message-Id: <20201015225736.12167-15-stephen@networkplumber.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201015225736.12167-1-stephen@networkplumber.org> References: <20200911190701.29171-1-stephen@networkplumber.org> <20201015225736.12167-1-stephen@networkplumber.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH v7 14/20] 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