X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=examples%2Fqos_sched%2Fargs.c;h=7431b29816aa2b91d443a2dfaa7ac03cd816452d;hb=9ad50c29d01d0d3e7a1f420178d795a92ca4b682;hp=c9cfdb24b376feaf94742f30372cb7ed736ba808;hpb=de3cfa2c9823a7e0391d4f4a355e2d78b83eec62;p=dpdk.git diff --git a/examples/qos_sched/args.c b/examples/qos_sched/args.c old mode 100755 new mode 100644 index c9cfdb24b3..7431b29816 --- a/examples/qos_sched/args.c +++ b/examples/qos_sched/args.c @@ -1,35 +1,5 @@ -/*- - * BSD LICENSE - * - * Copyright(c) 2010-2013 Intel Corporation. All rights reserved. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * * Neither the name of Intel Corporation nor the names of its - * contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - * +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 2010-2014 Intel Corporation */ #include @@ -69,7 +39,8 @@ static const char usage[] = " multiple pfc can be configured in command line \n" " \n" "Application optional parameters: \n" - " --mst I : master core index (default value is %u) \n" + " --i : run in interactive mode (default value is %u) \n" + " --mst I : master 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" @@ -85,6 +56,7 @@ static const char usage[] = " QoS enqueue size (default value is %u) \n" " C = QoS dequeue size (default value is %u) \n" " D = Worker lcore write burst size to NIC TX (default value is %u) \n" + " --msz M : Mempool size (in number of mbufs) for each pfc (default %u) \n" " --rth \"A, B, C\" : RX queue threshold parameters \n" " A = RX prefetch threshold (default value is %u) \n" " B = RX host threshold (default value is %u) \n" @@ -100,9 +72,10 @@ static const char usage[] = static void app_usage(const char *prgname) { - printf(usage, prgname, app_master_core, + printf(usage, prgname, APP_INTERACTIVE_DEFAULT, app_master_core, APP_RX_DESC_DEFAULT, APP_RING_SIZE, APP_TX_DESC_DEFAULT, - MAX_PKT_RX_BURST, PKT_ENQUEUE, PKT_DEQUEUE, MAX_PKT_TX_BURST, + MAX_PKT_RX_BURST, PKT_ENQUEUE, PKT_DEQUEUE, + MAX_PKT_TX_BURST, NB_MBUF, RX_PTHRESH, RX_HTHRESH, RX_WTHRESH, TX_PTHRESH, TX_HTHRESH, TX_WTHRESH ); @@ -110,23 +83,22 @@ app_usage(const char *prgname) static inline int str_is(const char *str, const char *is) { - return (strcmp(str, is) == 0); + return strcmp(str, is) == 0; } /* returns core mask used by DPDK */ static uint64_t app_eal_core_mask(void) { - uint32_t i; uint64_t cm = 0; - struct rte_config *cfg = rte_eal_get_configuration(); + uint32_t i; - for (i = 0; i < RTE_MAX_LCORE; i++) { - if (cfg->lcore_role[i] == ROLE_RTE) + for (i = 0; i < APP_MAX_LCORE; i++) { + if (rte_lcore_has_role(i, ROLE_RTE)) cm |= (1ULL << i); } - cm |= (1ULL << cfg->master_lcore); + cm |= (1ULL << rte_get_master_lcore()); return cm; } @@ -140,8 +112,8 @@ app_cpu_core_count(void) char path[PATH_MAX]; uint32_t ncores = 0; - for(i = 0; i < RTE_MAX_LCORE; i++) { - len = rte_snprintf(path, sizeof(path), SYS_CPU_DIR, i); + for (i = 0; i < APP_MAX_LCORE; i++) { + len = snprintf(path, sizeof(path), SYS_CPU_DIR, i); if (len <= 0 || (unsigned)len >= sizeof(path)) continue; @@ -160,7 +132,7 @@ static int app_parse_opt_vals(const char *conf_str, char separator, uint32_t n_vals, uint32_t *opt_vals) { char *string; - uint32_t i, n_tokens; + int i, n_tokens; char *tokens[MAX_OPT_VALUES]; if (conf_str == NULL || opt_vals == NULL || n_vals == 0 || n_vals > MAX_OPT_VALUES) @@ -173,10 +145,12 @@ app_parse_opt_vals(const char *conf_str, char separator, uint32_t n_vals, uint32 n_tokens = rte_strsplit(string, strnlen(string, 32), tokens, n_vals, separator); - for(i = 0; i < n_tokens; i++) { + if (n_tokens > MAX_OPT_VALUES) + return -1; + + for (i = 0; i < n_tokens; i++) opt_vals[i] = (uint32_t)atol(tokens[i]); - } - + free(string); return n_tokens; @@ -189,7 +163,7 @@ app_parse_ring_conf(const char *conf_str) uint32_t vals[3]; ret = app_parse_opt_vals(conf_str, ',', 3, vals); - if (ret != 3) + if (ret != 3) return ret; ring_conf.rx_size = vals[0]; @@ -206,7 +180,7 @@ app_parse_rth_conf(const char *conf_str) uint32_t vals[3]; ret = app_parse_opt_vals(conf_str, ',', 3, vals); - if (ret != 3) + if (ret != 3) return ret; rx_thresh.pthresh = (uint8_t)vals[0]; @@ -223,7 +197,7 @@ app_parse_tth_conf(const char *conf_str) uint32_t vals[3]; ret = app_parse_opt_vals(conf_str, ',', 3, vals); - if (ret != 3) + if (ret != 3) return ret; tx_thresh.pthresh = (uint8_t)vals[0]; @@ -241,14 +215,15 @@ app_parse_flow_conf(const char *conf_str) struct flow_conf *pconf; uint64_t mask; + memset(vals, 0, sizeof(vals)); ret = app_parse_opt_vals(conf_str, ',', 6, vals); if (ret < 4 || ret > 5) return ret; pconf = &qos_conf[nb_pfc]; - pconf->rx_port = (uint8_t)vals[0]; - pconf->tx_port = (uint8_t)vals[1]; + pconf->rx_port = vals[0]; + pconf->tx_port = vals[1]; pconf->rx_core = (uint8_t)vals[2]; pconf->wt_core = (uint8_t)vals[3]; if (ret == 5) @@ -262,17 +237,20 @@ app_parse_flow_conf(const char *conf_str) } if (pconf->rx_port >= RTE_MAX_ETHPORTS) { - RTE_LOG(ERR, APP, "pfc %u: invalid rx port %hu index\n", nb_pfc, pconf->rx_port); + RTE_LOG(ERR, APP, "pfc %u: invalid rx port %"PRIu16" index\n", + nb_pfc, pconf->rx_port); return -1; } if (pconf->tx_port >= RTE_MAX_ETHPORTS) { - RTE_LOG(ERR, APP, "pfc %u: invalid tx port %hu index\n", nb_pfc, pconf->rx_port); + RTE_LOG(ERR, APP, "pfc %u: invalid tx port %"PRIu16" index\n", + nb_pfc, pconf->tx_port); return -1; } mask = 1lu << pconf->rx_port; if (app_used_rx_port_mask & mask) { - RTE_LOG(ERR, APP, "pfc %u: rx port %hu is used already\n", nb_pfc, pconf->rx_port); + RTE_LOG(ERR, APP, "pfc %u: rx port %"PRIu16" is used already\n", + nb_pfc, pconf->rx_port); return -1; } app_used_rx_port_mask |= mask; @@ -280,7 +258,8 @@ app_parse_flow_conf(const char *conf_str) mask = 1lu << pconf->tx_port; if (app_used_tx_port_mask & mask) { - RTE_LOG(ERR, APP, "pfc %u: port %hu is used already\n", nb_pfc, pconf->tx_port); + RTE_LOG(ERR, APP, "pfc %u: port %"PRIu16" is used already\n", + nb_pfc, pconf->tx_port); return -1; } app_used_tx_port_mask |= mask; @@ -318,7 +297,7 @@ app_parse_burst_conf(const char *conf_str) return 0; } -/* +/* * Parses the argument given in the command line of the application, * calculates mask for used cores and initializes EAL with calculated core mask */ @@ -336,6 +315,7 @@ app_parse_args(int argc, char **argv) { "mst", 1, 0, 0 }, { "rsz", 1, 0, 0 }, { "bsz", 1, 0, 0 }, + { "msz", 1, 0, 0 }, { "rth", 1, 0, 0 }, { "tth", 1, 0, 0 }, { "cfg", 1, 0, 0 }, @@ -353,10 +333,14 @@ app_parse_args(int argc, char **argv) /* set en_US locale to print big numbers with ',' */ setlocale(LC_NUMERIC, "en_US.utf-8"); - while ((opt = getopt_long(argc, argv, "", + while ((opt = getopt_long(argc, argv, "i", lgopts, &option_index)) != EOF) { switch (opt) { + case 'i': + printf("Interactive-mode selected\n"); + interactive = 1; + break; /* long options */ case 0: optname = lgopts[option_index].name; @@ -388,6 +372,14 @@ app_parse_args(int argc, char **argv) } break; } + if (str_is(optname, "msz")) { + mp_size = atoi(optarg); + if (mp_size <= 0) { + RTE_LOG(ERR, APP, "Invalid mempool size %s\n", optarg); + return -1; + } + break; + } if (str_is(optname, "rth")) { ret = app_parse_rth_conf(optarg); if (ret) { @@ -464,4 +456,3 @@ app_parse_args(int argc, char **argv) return 0; } -