From patchwork Tue Sep 15 15:11:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 77755 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 05465A04C7; Tue, 15 Sep 2020 17:21:59 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id B2ED91C127; Tue, 15 Sep 2020 17:20:34 +0200 (CEST) Received: from mail-pg1-f193.google.com (mail-pg1-f193.google.com [209.85.215.193]) by dpdk.org (Postfix) with ESMTP id 9BF0D1C124 for ; Tue, 15 Sep 2020 17:20:32 +0200 (CEST) Received: by mail-pg1-f193.google.com with SMTP id z17so2165565pgc.4 for ; Tue, 15 Sep 2020 08:20:32 -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=iJrafaFXkOV/XuMT+F14pl3sF8K70LkkzZiSp6jJeXRLV6Im+JfeZ6aIvlfk96LlzG rGhiQEadHVedCcvjDxMoeV6dyOC4fH0+lhBLiuNkP6eKlQApojcHynHaRQaT0gN07X11 +7N8OzdZ+wFFrnsGIhfgVtL/NAzFBOh6ox6dSPJPAuxwzI1GNESAmUZ95CMOAf4VdoRb r4XPBHS32bTsn9AfsNiSZZ8Ou2+tpeGiJ0DjyPG4b98EDJXvhKII5RcOLOBV2vHNNw6E uHYGgmYLXsj4/R6jxd0ngoX2jVG66BwpktWwfBiOnxZZE6RmzccPblPl23qJRCchuJbZ nRRQ== 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=hybdfrld1GwJV04dzjAq8rfIAS3ZagJBogQMN9O3Ng39PQu/AxWv7BFpKA+S3zIGz8 r/AbcUMjy8+2SE07CS3yikMftGZ3MpkVw6tsyvd+1Kwr1BuHU4o/pb1EUFQQHZ6YUwuO 6lO9Mkv6lW1RgdcRvA2BQw5QfYP2AoqwrPRiJdi9ZIJwmqLP8fC8l4ivYF91z0zJyHxr /gBekjBwBM9koSu8coKn+weGlGWT018eLKuB+v5EV/CdMfBMrNXONzySqhjGmMXzWUJv n5pRr0zFBew5KSLnUNsr+V+uL0ZEmyJ8QARe3S7uaIUuJJMGAhDx9Bwb4UrKCYrUxU3b eVBQ== X-Gm-Message-State: AOAM530Rqv588UfQGJwa0jy/WqyZc1PwmzIEzBBt549SRPej0FZdXgTz llt3A2itBuGNYjOchaZsZVhhyj0q7ySpLQ== X-Google-Smtp-Source: ABdhPJzz+z+fJs1oMi1OQQJoB++fw3SHWPVH0vpaQDgv7CjbEQk6GEDZEt+roAKOehJJmisbO6XXdw== X-Received: by 2002:a17:902:6ac6:b029:cf:85a7:8373 with SMTP id i6-20020a1709026ac6b02900cf85a78373mr19642238plt.2.1600182708469; Tue, 15 Sep 2020 08:11:48 -0700 (PDT) Received: from hermes.lan (204-195-22-127.wavecable.com. [204.195.22.127]) by smtp.gmail.com with ESMTPSA id c127sm13742278pfa.165.2020.09.15.08.11.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 15 Sep 2020 08:11:47 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Anatoly Burakov Date: Tue, 15 Sep 2020 08:11:12 -0700 Message-Id: <20200915151114.12024-16-stephen@networkplumber.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200915151114.12024-1-stephen@networkplumber.org> References: <20200911190701.29171-1-stephen@networkplumber.org> <20200915151114.12024-1-stephen@networkplumber.org> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v3 15/17] 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);