From patchwork Fri Jun 5 22:58:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 70906 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 BC8A2A0350; Sat, 6 Jun 2020 01:01:52 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 73E3F1D651; Sat, 6 Jun 2020 00:59:24 +0200 (CEST) Received: from mail-pj1-f47.google.com (mail-pj1-f47.google.com [209.85.216.47]) by dpdk.org (Postfix) with ESMTP id 602911D64D for ; Sat, 6 Jun 2020 00:59:22 +0200 (CEST) Received: by mail-pj1-f47.google.com with SMTP id jz3so3250752pjb.0 for ; Fri, 05 Jun 2020 15:59: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=ubF0gJoToR3cgQbcrlH/RtpDCsnJfiu4gPKw0GIo80Y=; b=YrAztnT625bluCJIorN9CIRlB4rBn9GCIxG3NM78R54ddlLP9R8nsFc56ETxBgrhPk NHPR/ptD+wr0u6kgH2gFjIUXbUvzV3OMKl/gxeQh3XTCu/Uz4FXT5EYuPPQB8WcKJfOy JWmqYz/8JJfmHSj6T4YitlbnlYzp/5W6JNp5t791YR8T4CdrQirkQHpLTyRTEIs6YNsk tcw+dI+rdnh8wxyTdFcR2kBMqYaOeGORavKRCQ5aA4qJvQORnIJAkHzBI7tMd23LsTAx n5EMN1yP4OXBWODDLHDxQ+WP5iF7/fbdRIfLG96Uxy6dfE+eb9ocyZ+6M7fFiHyhXgOm GoUg== 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=ubF0gJoToR3cgQbcrlH/RtpDCsnJfiu4gPKw0GIo80Y=; b=ccPNlgUhO7PyfHoWYn9nDB4AVOmZHdiBDVPIrmsqsLHJsE9avdr7zwrCIdfdIwBqHq 2rnHoGBGuijQ5bDpJEkm4TMZf+2uBdRb2TZei0pVnMPFGnwgqEKrQVCVccXcmA25OZUk aQhYO8EoLUVKtB5agtDIyvJRPs/+rH3KLCEJnqdcFCU/bueEm9W1dZUMmFCGf2nsj9rG seTaTX+pCfKKu6M7MAJPb/KeFX/F9ZwRivM/A60+MWYazCkoXj9otTD4a1mYM8lKku1+ E1+4yUGQlvdavwz35WYKFZcxhPGdoPeDqyI7SnHQQJ1OYx1vpHh1PBxEK49QntNJW3qS I4UA== X-Gm-Message-State: AOAM530ZuYCaKTIEc/46lt7G2evtaUOtiv+Bl6Vkk8dlJKG43qWf6A1Q wV9FgZp22eluOZEiMAXb10Fvg7bmhV0= X-Google-Smtp-Source: ABdhPJx237quuDrwqpakOvObX7HTDLVK2wfqSFUwvHoGiS/wqlYDQg95T42QXtyYffP3sHTlxFWJmw== X-Received: by 2002:a17:902:223:: with SMTP id 32mr11513335plc.331.1591397961069; Fri, 05 Jun 2020 15:59:21 -0700 (PDT) Received: from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id j186sm543121pfb.220.2020.06.05.15.59.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Jun 2020 15:59:20 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Date: Fri, 5 Jun 2020 15:58:03 -0700 Message-Id: <20200605225811.26342-19-stephen@networkplumber.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200605225811.26342-1-stephen@networkplumber.org> References: <20200604210200.25405-1-stephen@networkplumber.org> <20200605225811.26342-1-stephen@networkplumber.org> MIME-Version: 1.0 Subject: [dpdk-dev] [RFC v2 18/26] 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 --- 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 5381207cc283..d3893ea3763f 100644 --- a/app/test-pmd/config.c +++ b/app/test-pmd/config.c @@ -2647,9 +2647,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; }