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 B4F9AA04B7; Tue, 13 Oct 2020 17:32:32 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 03FB71DD89; Tue, 13 Oct 2020 17:27:42 +0200 (CEST) Received: from mail-pg1-f194.google.com (mail-pg1-f194.google.com [209.85.215.194]) by dpdk.org (Postfix) with ESMTP id 00A901DD81 for ; Tue, 13 Oct 2020 17:27:38 +0200 (CEST) Received: by mail-pg1-f194.google.com with SMTP id r10so17762339pgb.10 for ; Tue, 13 Oct 2020 08:27:38 -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=aIXYI9B20dQtdoJQfys6eMqB9l//6zs1jOUhdL8dvpXcOwFw5zO+pDgLPVVMVQ6J6Y dIp+0R6Y2ZRBE7mYoUo4F8QRmPO/Xxa5t23tgSAzEMSyiv9jVtv1p88UYECVT/kw7Xui Izl1bqco22qmyZbLS30nh5xNwo0PeyPfRHXQNXN4zKmYs3tZTOBT0vjhUF6GCEGLCcuQ 6q3WZhZHc1WbpSYKzmc/qEOrly0xkxxzN0FDZNuQQ5EtbmRKX4QAFZy1HCUQNIycor+/ DwE9Le4g/EushfA0CC2DtlrNd/uV1HgoWEQwEk+jyju9Dt5RH4K4RqxUi/VFYRHhC81l 4OXQ== 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=ovkYXHyxNcjM3a8nzGR4o/9ddyYB6COf/9jQZG7b+LqAkSgZRW8E/0UBajXgorcQr8 3ySY+tjCT1urqSdl7l9DSsdSCkSF26aC6nHXCrgxNF1zl3P58U05JuyiAmZObAlmhqt1 06gC0RX2iBeltLT5JK1LzcP6/XkNKE3Dwtp2D1wSsEOGukgA4RoW6w+/6/LqBd5r0m27 lye+GJhysD60KsTWS95vjBLPCicaPqLY9/RMXksug7aWXklc3rRyXF8umKDSoLBswOHL wqOPvmNXY/zeivm4x3I7JieRGA+zRM/O64VO8Xb+TZHtlFomAHnJIV9vMm8X/+QXhSaX g33w== X-Gm-Message-State: AOAM533u+aQcTcNGjGwIcM5N+blQfsKHjurZPLF3Ho8Akl/9BO+WQhdw LavM9Cin0zG3b9nB0ySXVbuoCAmb3Is1OA== X-Google-Smtp-Source: ABdhPJxFRXOJX0DadEBmo0KxMswDQ5ffnJBixAw+bqBN4wENda+aMHqNF3V3MknBYQihDHIInRpF3w== X-Received: by 2002:a63:845:: with SMTP id 66mr64011pgi.318.1602602856149; Tue, 13 Oct 2020 08:27:36 -0700 (PDT) Received: from hermes.local (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id z12sm23815233pfr.197.2020.10.13.08.27.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 13 Oct 2020 08:27:33 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Anatoly Burakov , John McNamara Date: Tue, 13 Oct 2020 08:26:06 -0700 Message-Id: <20201013152610.2589-15-stephen@networkplumber.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201013152610.2589-1-stephen@networkplumber.org> References: <20200914182002.6750-1-stephen@networkplumber.org> <20201013152610.2589-1-stephen@networkplumber.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH v5 14/18] 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