From patchwork Wed Jul 1 20:23:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 72683 X-Patchwork-Delegate: thomas@monjalon.net 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 ADAC3A0350; Wed, 1 Jul 2020 22:27:00 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 5CFEA1D618; Wed, 1 Jul 2020 22:24:35 +0200 (CEST) Received: from mail-pj1-f67.google.com (mail-pj1-f67.google.com [209.85.216.67]) by dpdk.org (Postfix) with ESMTP id 5DE851D603 for ; Wed, 1 Jul 2020 22:24:33 +0200 (CEST) Received: by mail-pj1-f67.google.com with SMTP id l6so8329188pjq.1 for ; Wed, 01 Jul 2020 13:24:33 -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=gY95tjbbLspwO1mZqwsh0b2j3kKWOm4FnvQonp+EeR0=; b=pUHb0eQMxHeNnLtWXYs4cOZPAsuq1SM6UOpyjKfshQD7BEVhRSu+Y7cQCzuZACpMja lBYH7SMFCW9tmZna59g4zrvuMCRPC2zlV41HGoLKdd8ebxH3sakJ9hTC4SeUcV+JyCvt QYMD7fCBnnkaQK0onlj1j49hsMQqSMeTIbwCELJHOhIMhGJO+Iu+SU6nhkr5UVNMMNNx Nq8sd/jUR9m/Aw/0ZrmS64ztTSYJ/2koJHBeZeinXpQ43ertR1AQAVtl8/5RMA3u+0JU 4d2G5UQ/6GsBHge6047K0Ic0f0LgDZj3PThQW3ib0WGCs9DoXdVvp2hMPnwH7qiThNYb nugQ== 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=gY95tjbbLspwO1mZqwsh0b2j3kKWOm4FnvQonp+EeR0=; b=ZtPGurv1jc0T8bMl94tvJ5yV+LFmXJDFOOvqkOUl+uVOmtUd+RNRa2Tx5NlRIGsu3n qHUo6viGjtmHiU1LyOe2eEMLdg4ZgLiUrmrl1Jwy64UVdLoXzZuh12GgDZ7ITzErT+f5 riwDz+oCE9j+jG6h9pcAruZW+7gwilnXUxGl0Fw7Gwq6RR474LsYtMoAKfDIhVr0ydHj +sde8qaRAaTpqfSnsDmgc59fsUaz6Xq+d34FEOIagOFVd3O8TOT6tiJirF/jqM0ijodQ tjw0THbpgVX1LZEZM8l87WHUD66y/djllzsKe9d3GPx3zWfIkz1feI34GgKWtNeRog0q m1VA== X-Gm-Message-State: AOAM532ankTTLeD0myrNA8RZB5pA6IUHUHJrCpg6KUEii+lBdWQYzUvn LkLtsFsAJCCEW6Gdk5yRIzDziwlVmaQ= X-Google-Smtp-Source: ABdhPJwKqVRR5lBlOLL7Scsp21Ai49p87I8Bpt4JUVdpw/ZySFWxf7BcwZ+XP8ynQhKB9un/gwlVUg== X-Received: by 2002:a17:90a:a413:: with SMTP id y19mr16181653pjp.59.1593635072114; Wed, 01 Jul 2020 13:24:32 -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 g8sm6584803pgr.70.2020.07.01.13.24.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Jul 2020 13:24:31 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Wed, 1 Jul 2020 13:23:50 -0700 Message-Id: <20200701202359.17006-19-stephen@networkplumber.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200701202359.17006-1-stephen@networkplumber.org> References: <20200604210200.25405-1-stephen@networkplumber.org> <20200701202359.17006-1-stephen@networkplumber.org> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v4 18/27] app/test-pmd: change references to master/slave 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" Use new API and naming convention Signed-off-by: Stephen Hemminger Acked-by: Anatoly Burakov --- app/test-pmd/config.c | 4 ++-- app/test-pmd/parameters.c | 2 +- app/test-pmd/softnicfwd.c | 2 +- app/test-pmd/testpmd.c | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c index a7112c998bdb..816d9e2064ef 100644 --- a/app/test-pmd/config.c +++ b/app/test-pmd/config.c @@ -2649,9 +2649,9 @@ set_fwd_lcores_list(unsigned int *lcorelist, unsigned int nb_lc) printf("lcore %u not enabled\n", lcore_cpuid); return -1; } - if (lcore_cpuid == rte_get_master_lcore()) { + if (lcore_cpuid == rte_get_initial_lcore()) { printf("lcore %u cannot be masked on for running " - "packet forwarding, which is the master lcore " + "packet forwarding, which is the initial lcore " "and reserved for command line parsing only\n", lcore_cpuid); return -1; diff --git a/app/test-pmd/parameters.c b/app/test-pmd/parameters.c index f761e14707bf..48aafa289367 100644 --- a/app/test-pmd/parameters.c +++ b/app/test-pmd/parameters.c @@ -88,7 +88,7 @@ usage(char* progname) printf(" --nb-ports=N: set the number of forwarding ports " "(1 <= N <= %d).\n", nb_ports); printf(" --coremask=COREMASK: hexadecimal bitmask of cores running " - "the packet forwarding test. The master lcore is reserved for " + "the packet forwarding test. The initial lcore is reserved for " "command line parsing only, and cannot be masked on for " "packet forwarding.\n"); printf(" --portmask=PORTMASK: hexadecimal bitmask of ports used " diff --git a/app/test-pmd/softnicfwd.c b/app/test-pmd/softnicfwd.c index e9d437364467..d773551845e4 100644 --- a/app/test-pmd/softnicfwd.c +++ b/app/test-pmd/softnicfwd.c @@ -654,7 +654,7 @@ softnic_fwd_begin(portid_t pi) if (!rte_lcore_is_enabled(lcore)) continue; - if (lcore == rte_get_master_lcore()) + if (lcore == rte_get_initial_lcore()) continue; if (fwd_core_present == 0) { diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c index 4989d22ca86c..a68ef351e37e 100644 --- a/app/test-pmd/testpmd.c +++ b/app/test-pmd/testpmd.c @@ -83,7 +83,7 @@ uint16_t verbose_level = 0; /**< Silent by default. */ int testpmd_logtype; /**< Log type for testpmd logs */ -/* use master core for command line ? */ +/* use initial core for command line ? */ uint8_t interactive = 0; uint8_t auto_start = 0; uint8_t tx_first; @@ -552,7 +552,7 @@ set_default_fwd_lcores_config(void) } socket_ids[num_sockets++] = sock_num; } - if (i == rte_get_master_lcore()) + if (i == rte_get_initial_lcore()) continue; fwd_lcores_cpuids[nb_lc++] = i; }