From patchwork Thu Oct 15 22:57:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 81002 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 E9FE2A04DB; Fri, 16 Oct 2020 01:03:21 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 8D6241E880; Fri, 16 Oct 2020 00:58:22 +0200 (CEST) Received: from mail-pl1-f196.google.com (mail-pl1-f196.google.com [209.85.214.196]) by dpdk.org (Postfix) with ESMTP id A1F181E549 for ; Fri, 16 Oct 2020 00:58:09 +0200 (CEST) Received: by mail-pl1-f196.google.com with SMTP id d6so172920plo.13 for ; Thu, 15 Oct 2020 15:58:09 -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=VNY1KhgsJD3GcA6mjqblFk+QzrNxxZeFn62v2JRyVi0=; b=Qng34TaBCW5A8vy0T0zK5eqJ/xkVOCELIP0ujDleczRrLQpbGC8SEvW/hMmDD/mwcs tjZCSc2GE0e1+afo+K8wIqDeeg1IpRoAXYiMGP+Q8ISAurG52WaXscUMRsymbJeL0AZz fpi8lvB0c/1U4dnspSgwHUX0xFhJhWdJZheovk3TzEYI7NMfgtEzkFLttFWWVtzgiAm4 pE97pthGH/NHSOlxvPUU5XedYBDDAv+R1ve9NXi8LZ5A+Z/sqoBkUbqPQ3NNa9Lp8hFd YRguHqb77mIdp6uah06SfdfPm9841O+RNtKt1FhSP4IlUuANyZGJelpHItxntVSXC56n iZmA== 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=VNY1KhgsJD3GcA6mjqblFk+QzrNxxZeFn62v2JRyVi0=; b=D91eKfGv4KhxH3ZEA/pLJTFlsdgsbS3oiyNFkFDCaMF55JJpOvVGsI0NkOlSwLVRs4 Suyayog3p58I4Ujz90O5i9pnZzoIRS3IvC1EX3ogK6X2zJOK3Lt+WytE3zVEsYaEsCTz AEPqY5xZQVJaE2GkGTvKszhzDo0YyDIfLAPrAbmaX14leUf8TrEuVTWfsuGXeo+CxeZP +sdi4bnNW3Kf+oz+XAXsgfn8TU0rOG00j7bnRxk9ti1Ei/5kuVU/ljkxnk0lRg1cPuZU kvn7wjcUJy0bB+IoJ5oDQaaHxnSpLCN7KzGXESkuSNqMSlmmd4zYf5h/iwiF5teXsGJV V5Vg== X-Gm-Message-State: AOAM5332Anr/daFmJfyskDuB1QjVLY+LHM66+Jo2AW9GkofA1jW8zbsk uMp9v3yDpLB6j9N9tRVG54HV//JzPLJ41g== X-Google-Smtp-Source: ABdhPJyfoVunYsJ7eUyF57Czrt2dh6CSKyTsL1YOWzB0s/zrKhTyKmkNuS8vX/aZdYpBOY0KphFVvA== X-Received: by 2002:a17:902:8ec7:b029:d2:42fe:37de with SMTP id x7-20020a1709028ec7b02900d242fe37demr764887plo.23.1602802687426; Thu, 15 Oct 2020 15:58:07 -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 x4sm324055pfm.86.2020.10.15.15.58.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Oct 2020 15:58:06 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Anatoly Burakov Date: Thu, 15 Oct 2020 15:57:31 -0700 Message-Id: <20201015225736.12167-16-stephen@networkplumber.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201015225736.12167-1-stephen@networkplumber.org> References: <20200911190701.29171-1-stephen@networkplumber.org> <20201015225736.12167-1-stephen@networkplumber.org> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v7 15/20] examples/qos: replace references to master 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 main instead of master in the QoS examples. Replace the "mst" command line argument with "mnc" Acked-by: Anatoly Burakov Signed-off-by: Stephen Hemminger --- examples/qos_meter/main.c | 4 ++-- examples/qos_sched/args.c | 26 +++++++++++++------------- examples/qos_sched/cmdline.c | 2 +- examples/qos_sched/main.c | 2 +- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/examples/qos_meter/main.c b/examples/qos_meter/main.c index ce87b2eca262..f2d9c28828ab 100644 --- a/examples/qos_meter/main.c +++ b/examples/qos_meter/main.c @@ -454,8 +454,8 @@ main(int argc, char **argv) rte_exit(EXIT_FAILURE, "Invalid configure flow table\n"); /* Launch per-lcore init on every lcore */ - rte_eal_mp_remote_launch(main_loop, NULL, CALL_MASTER); - RTE_LCORE_FOREACH_SLAVE(lcore_id) { + rte_eal_mp_remote_launch(main_loop, NULL, CALL_MAIN); + RTE_LCORE_FOREACH_WORKER(lcore_id) { if (rte_eal_wait_lcore(lcore_id) < 0) return -1; } diff --git a/examples/qos_sched/args.c b/examples/qos_sched/args.c index 7431b29816aa..c627196230b6 100644 --- a/examples/qos_sched/args.c +++ b/examples/qos_sched/args.c @@ -22,7 +22,7 @@ #define MAX_OPT_VALUES 8 #define SYS_CPU_DIR "/sys/devices/system/cpu/cpu%u/topology/" -static uint32_t app_master_core = 1; +static uint32_t app_main_core = 1; static uint32_t app_numa_mask; static uint64_t app_used_core_mask = 0; static uint64_t app_used_port_mask = 0; @@ -40,7 +40,7 @@ static const char usage[] = " \n" "Application optional parameters: \n" " --i : run in interactive mode (default value is %u) \n" - " --mst I : master core index (default value is %u) \n" + " --mnc I : main core index (default value is %u) \n" " --rsz \"A, B, C\" : Ring sizes \n" " A = Size (in number of buffer descriptors) of each of the NIC RX \n" " rings read by the I/O RX lcores (default value is %u) \n" @@ -72,7 +72,7 @@ static const char usage[] = static void app_usage(const char *prgname) { - printf(usage, prgname, APP_INTERACTIVE_DEFAULT, app_master_core, + printf(usage, prgname, APP_INTERACTIVE_DEFAULT, app_main_core, APP_RX_DESC_DEFAULT, APP_RING_SIZE, APP_TX_DESC_DEFAULT, MAX_PKT_RX_BURST, PKT_ENQUEUE, PKT_DEQUEUE, MAX_PKT_TX_BURST, NB_MBUF, @@ -98,7 +98,7 @@ app_eal_core_mask(void) cm |= (1ULL << i); } - cm |= (1ULL << rte_get_master_lcore()); + cm |= (1ULL << rte_get_main_lcore()); return cm; } @@ -312,7 +312,7 @@ app_parse_args(int argc, char **argv) static struct option lgopts[] = { { "pfc", 1, 0, 0 }, - { "mst", 1, 0, 0 }, + { "mnc", 1, 0, 0 }, { "rsz", 1, 0, 0 }, { "bsz", 1, 0, 0 }, { "msz", 1, 0, 0 }, @@ -352,8 +352,8 @@ app_parse_args(int argc, char **argv) } break; } - if (str_is(optname, "mst")) { - app_master_core = (uint32_t)atoi(optarg); + if (str_is(optname, "mnc")) { + app_main_core = (uint32_t)atoi(optarg); break; } if (str_is(optname, "rsz")) { @@ -408,18 +408,18 @@ app_parse_args(int argc, char **argv) } } - /* check master core index validity */ - for(i = 0; i <= app_master_core; i++) { - if (app_used_core_mask & (1u << app_master_core)) { - RTE_LOG(ERR, APP, "Master core index is not configured properly\n"); + /* check main core index validity */ + for (i = 0; i <= app_main_core; i++) { + if (app_used_core_mask & (1u << app_main_core)) { + RTE_LOG(ERR, APP, "Main core index is not configured properly\n"); app_usage(prgname); return -1; } } - app_used_core_mask |= 1u << app_master_core; + app_used_core_mask |= 1u << app_main_core; if ((app_used_core_mask != app_eal_core_mask()) || - (app_master_core != rte_get_master_lcore())) { + (app_main_core != rte_get_main_lcore())) { RTE_LOG(ERR, APP, "EAL core mask not configured properly, must be %" PRIx64 " instead of %" PRIx64 "\n" , app_used_core_mask, app_eal_core_mask()); return -1; diff --git a/examples/qos_sched/cmdline.c b/examples/qos_sched/cmdline.c index ba68e0d02693..1cf7ea97abbf 100644 --- a/examples/qos_sched/cmdline.c +++ b/examples/qos_sched/cmdline.c @@ -599,7 +599,7 @@ cmdline_parse_ctx_t main_ctx[] = { NULL, }; -/* prompt function, called from main on MASTER lcore */ +/* prompt function, called from main on MAIN lcore */ void prompt(void) { diff --git a/examples/qos_sched/main.c b/examples/qos_sched/main.c index 73864d66dbc8..a6071b991c76 100644 --- a/examples/qos_sched/main.c +++ b/examples/qos_sched/main.c @@ -204,7 +204,7 @@ main(int argc, char **argv) return -1; /* launch per-lcore init on every lcore */ - rte_eal_mp_remote_launch(app_main_loop, NULL, SKIP_MASTER); + rte_eal_mp_remote_launch(app_main_loop, NULL, SKIP_MAIN); if (interactive) { sleep(1);