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 ADFB3A04C7; Mon, 14 Sep 2020 20:21:41 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 672591C135; Mon, 14 Sep 2020 20:20:29 +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 D67F61C11B for ; Mon, 14 Sep 2020 20:20:23 +0200 (CEST) Received: by mail-pf1-f195.google.com with SMTP id k15so241465pfc.12 for ; Mon, 14 Sep 2020 11:20:23 -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=RELFVN4LJp/xdGv7GWWLDJ17W+LxdxUr0fMv+CTgyRg=; b=C3fGkfpzoi1cCE9UdmkX0mKobf9BEtT6pKZe78w02PKql2Oa430S4Pd04hZtvOFz+T eGOP0VqMbL4dH5LkG+8iMHzZr5N4Tmuxz1MKy0FLdnyq6VR1MM0NstttKL12Gr66Y/8x QNTlKDOVEI25hbvY3Pl74uzMXB3ThLascdCHcUvxV+baf32Uv+dxLGhnmSYMuw7+Rog7 wXmfp6lHyTJGk1+svLu++OYkedyGjo2q1sGBaGVI0W3i3FOI7YPuwtYXZLCXh7W9C4nz 0SAm0+1Fmrgiq5elo5oPXd1QxkgoB7itPC398EbERwa8hvy6yAiYJF2Wfc3xPO8colL3 TfkQ== 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=RELFVN4LJp/xdGv7GWWLDJ17W+LxdxUr0fMv+CTgyRg=; b=h8egN7oq62sow3Q4t1Ao3Y2D4C4MM5+muqLmvAOL17UQJk/ox9nuIo60wB7D7sO9Iu SUNJGH7GTMITWAwBu6WH14Se35Jce1xKtGs3bT8/E6KMAz9XIp/j6GyEmlcM/V1+YDIU +dVAvHeoWrAwNRrjQaATjxJIjRnxk+CV0Q7wMZwfHWg0nqUFd9KUpJqb08L8hhvNftT6 Jp9DwF/ZulG+ompgmtXjxnMTKPeO8KoK1RBUIknJEC1B+Ifphp3Sfp2iHZF8CirtTG35 qNfb4OFTV7d9xP2Kqx1F3IooLaorrAcqCR1qeBedmEuz4tIkk/77+rM4TYkS0eHfhP58 H67w== X-Gm-Message-State: AOAM532HkjtJs1UHRk4h+7tlS+UtR7LEBiMNrM8iB2ye8v+sd9vryRo4 S88OCs5QlY3g/6wGXDN50FE7TBRQAyUn2Q== X-Google-Smtp-Source: ABdhPJxnGiee9/GoPK3faGGGQUMUzAHcKLPdB/hQuCKTPwzrf61YUVi9RryIVHZf46AvS95F3sSTnQ== X-Received: by 2002:a62:6dc3:0:b029:13c:1611:658d with SMTP id i186-20020a626dc30000b029013c1611658dmr14739567pfc.10.1600107622662; Mon, 14 Sep 2020 11:20:22 -0700 (PDT) Received: from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id u6sm9952728pjy.37.2020.09.14.11.20.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Sep 2020 11:20:21 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Anatoly Burakov Date: Mon, 14 Sep 2020 11:19:54 -0700 Message-Id: <20200914182002.6750-10-stephen@networkplumber.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200914182002.6750-1-stephen@networkplumber.org> References: <20200911190701.29171-1-stephen@networkplumber.org> <20200914182002.6750-1-stephen@networkplumber.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH v2 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 0a6ed85f3395..966dbb41c667 100644 --- a/app/test-pmd/cmdline.c +++ b/app/test-pmd/cmdline.c @@ -19709,7 +19709,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 30bee332481a..1e841f191702 100644 --- a/app/test-pmd/config.c +++ b/app/test-pmd/config.c @@ -2683,9 +2683,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 7cb0e3d6ec0a..6d10debc317d 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 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 7842c3b78120..165e35f7e8a4 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; @@ -556,7 +556,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