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 24D94A04BC; Fri, 9 Oct 2020 23:41:56 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 65CA51D5E4; Fri, 9 Oct 2020 23:39:22 +0200 (CEST) Received: from mail-pf1-f195.google.com (mail-pf1-f195.google.com [209.85.210.195]) by dpdk.org (Postfix) with ESMTP id 603CA1D5AF for ; Fri, 9 Oct 2020 23:39:15 +0200 (CEST) Received: by mail-pf1-f195.google.com with SMTP id f19so7917542pfj.11 for ; Fri, 09 Oct 2020 14:39:15 -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=MB/6X1jfKGGitKqscFFiPV4DcHvuwrLFgGFWRklusDA=; b=WqJXIvCR4VakYd04IzI/qhsJ63ufq8IE7Q/k/F6zxvs4htjtzDSDPWe17Z+aP4RWDn dN8HJDqrNglTW26GEvlXVUHvkCsSPaZXRZ3jJxPKzA+tGePd1rfSG8i3x961jydL2wCR ixWPkCf11+DgC+kUKtHto6lwfExZWLuA+tLVaImDs+ceaTzG7gzssVf6uQtBOLMc7JmZ VsGyKoCOkNKRu4EJYxn39iki6KH4TIX5RQkYE+TJTtpfziJisU1GApZUe33RP714FyAc 0pc+5WnTYV/jdzKpSC0K9ja3URyNWhG1o7eGBjrZCYLQ4mXlQhTFpF7i9ceBNcibq6we q7ag== 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=MB/6X1jfKGGitKqscFFiPV4DcHvuwrLFgGFWRklusDA=; b=p8drb3sGUsrNpde8+x9HG73UOo0D6fnk3D74ndMF+Ebh8vDB8juomlDi8AOso043Uz juqqfTVdDpKSksG9sUSDrCYEZagRO7KYHcM/N7z+AIpw48YYwjItRC1DP49AEKYxgiWO pdgJ1ZP60+xeV3r8gaHYogiO5CFLufRzVBXtCsk2ld8JdgOLvqYAUFOWN9LwJXK2bDSB JoRXYbkeiI1MxcwFDauctKvpqniuUqDSg6Yg1bD61le1Wre7nxw9ffD+tqNH/iyExQ+h 2yENX8cGIqegpaYWwVQcSUxXUXNh0mOnIavKNFL2NNgrgfntEBBBIHFmlpMTJeBZNh9L 3GWA== X-Gm-Message-State: AOAM5317htf+StMVwYYGKUvOIZWAQhJ1nUlS+jhlUI7c5yMNgDav66Jq 6UU4mkp12lIYP9QzwVfPX4JQj2VDaDqwdA== X-Google-Smtp-Source: ABdhPJz3B0fxVnWOzbkU+kS/MhMr6Xh7qD1VIP9BxHRmciohNvSgQUUzi4R30B0wE626ufFS4I57zg== X-Received: by 2002:a63:e544:: with SMTP id z4mr5071437pgj.235.1602279554139; Fri, 09 Oct 2020 14:39:14 -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 x18sm12173381pfj.90.2020.10.09.14.39.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 Oct 2020 14:39:13 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Anatoly Burakov Date: Fri, 9 Oct 2020 14:38:47 -0700 Message-Id: <20201009213855.17933-10-stephen@networkplumber.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201009213855.17933-1-stephen@networkplumber.org> References: <20200911190701.29171-1-stephen@networkplumber.org> <20201009213855.17933-1-stephen@networkplumber.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH v4 09/17] app/test-pmd: replace master lcore with main 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 wording around main lcore. Acked-by: Anatoly Burakov Signed-off-by: Stephen Hemminger --- app/test-pmd/cmdline.c | 2 +- app/test-pmd/config.c | 4 ++-- app/test-pmd/parameters.c | 2 +- app/test-pmd/testpmd.c | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c index 524c75b267c5..32ce997ef1e9 100644 --- a/app/test-pmd/cmdline.c +++ b/app/test-pmd/cmdline.c @@ -19877,7 +19877,7 @@ cmdline_read_from_file(const char *filename) printf("Read CLI commands from %s\n", filename); } -/* prompt function, called from main on MASTER lcore */ +/* prompt function, called from main on MAIN lcore */ void prompt(void) { diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c index e73dc66c8d06..187cd991e556 100644 --- a/app/test-pmd/config.c +++ b/app/test-pmd/config.c @@ -2907,9 +2907,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_main_lcore()) { printf("lcore %u cannot be masked on for running " - "packet forwarding, which is the master lcore " + "packet forwarding, which is the main 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 1ead59579bfc..712d9ec70b66 100644 --- a/app/test-pmd/parameters.c +++ b/app/test-pmd/parameters.c @@ -89,7 +89,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 main 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/testpmd.c b/app/test-pmd/testpmd.c index ccba71c07610..21f977cc3f3b 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 main core for command line ? */ uint8_t interactive = 0; uint8_t auto_start = 0; uint8_t tx_first; @@ -566,7 +566,7 @@ set_default_fwd_lcores_config(void) } socket_ids[num_sockets++] = sock_num; } - if (i == rte_get_master_lcore()) + if (i == rte_get_main_lcore()) continue; fwd_lcores_cpuids[nb_lc++] = i; } -- 2.27.0