From patchwork Fri Sep 11 19:06:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 77479 Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id EBB2EA04C0; Fri, 11 Sep 2020 21:09:18 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id C145E1C1B1; Fri, 11 Sep 2020 21:07:30 +0200 (CEST) Received: from mail-pj1-f46.google.com (mail-pj1-f46.google.com [209.85.216.46]) by dpdk.org (Postfix) with ESMTP id 631731C196 for ; Fri, 11 Sep 2020 21:07:26 +0200 (CEST) Received: by mail-pj1-f46.google.com with SMTP id t7so2156532pjd.3 for ; Fri, 11 Sep 2020 12:07:26 -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=XtefX5MH5WPzY2uokmhuhnzrKblk/LAjdWX13tcdcFs=; b=t0WlUX/JObVlYn7JQEWQywqHZzQFsaF6KlBpSaqhjJH4xiXz2xOpbb6/ZJZ2kygGIt /gQg+sxoyvRyW2GCP4HpckBZqOREiMZdgJjeZdSKDmG7L+Bac3froYLSBk4GCirwJuIX uF5Vrw8m00p4iZn52+BWpoTbvtMhnfY6x4Yy5dh5UqkpV3dTPOUm6/yPrmlClGyBVhun zfjcmbCW11eZeoT5HOjgNdnIIauckfNacnPhw4oI7Ga/cyxKn+BKAeEtHHPmjPiyMsLf ezNS16RxvmCoBiB76NjHTiYLvDaq6+oa3ytbdVHC6RGd7JPTZAfoKDW36QUK4uOn8pwx IhYw== 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=XtefX5MH5WPzY2uokmhuhnzrKblk/LAjdWX13tcdcFs=; b=HJSAoxZ10reUJUg6OawmZxM6Yzyxx72E5vjwfaEGwYKrN5RocKa96szRgcpktN2gnG sm6QZ0RbmiLS4tPUQaNfT/ldmV347QTkmb6AsAHfN6rFuMBk4bCOafJ8JU0JEZTGaH8B cB+l8GNB3QR6K99KrwswJlhPsV/BzljjQrLmNdtH1pePUK/nxHJm59wUFj2XvYMp6S6E LS1oVMa880dXRYJ8H2TRa0bgjwK6V/IHkdE0rpsM/+UmhVYDKd8o53OgGcPRf5tJzOOB OercPyJ74Ui1c/nJzPE/Q1NlQWiW+a5N5HZ12Kxsd863E3P2OQj6NhoXVGCc4eDa/HKX BTqg== X-Gm-Message-State: AOAM530mETgf/M2zFsCxz5UuUSFjMWjWiix6wnexNwdvXsEt02P5P028 Wy+x2CRMYp/tblPdXcTXmdJu+jDvCMsUyA== X-Google-Smtp-Source: ABdhPJy/X8z15Hf0kfN9CRHHnS6b7aOUI5IdIl7b4RK4v16TF4zRb4aCcQjF4E4Nu2wVN93+MNL81w== X-Received: by 2002:a17:90a:c20f:: with SMTP id e15mr2935016pjt.163.1599851244944; Fri, 11 Sep 2020 12:07:24 -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 z23sm2979984pfg.220.2020.09.11.12.07.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Sep 2020 12:07:24 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Fri, 11 Sep 2020 12:06:58 -0700 Message-Id: <20200911190701.29171-13-stephen@networkplumber.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200911190701.29171-1-stephen@networkplumber.org> References: <20200911190701.29171-1-stephen@networkplumber.org> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH 12/15] 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. Signed-off-by: Stephen Hemminger Acked-by: Anatoly Burakov --- examples/performance-thread/l3fwd-thread/main.c | 14 +++++++------- examples/performance-thread/pthread_shim/main.c | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/examples/performance-thread/l3fwd-thread/main.c b/examples/performance-thread/l3fwd-thread/main.c index e32802aa9b8b..9b4993e0fd63 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,13 +3762,13 @@ 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_eal_mp_remote_launch(pthread_run, NULL, CALL_MAIN); RTE_LCORE_FOREACH_SLAVE(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..d5477ef2324d 100644 --- a/examples/performance-thread/pthread_shim/main.c +++ b/examples/performance-thread/pthread_shim/main.c @@ -252,7 +252,7 @@ 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) {