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 0C92EA09D2; Wed, 11 Nov 2020 09:16:33 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 25E975937; Wed, 11 Nov 2020 09:15:53 +0100 (CET) Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by dpdk.org (Postfix) with ESMTP id 549A8DED for ; Wed, 11 Nov 2020 09:15:51 +0100 (CET) Received: by mail-wr1-f65.google.com with SMTP id k2so1650762wrx.2 for ; Wed, 11 Nov 2020 00:15:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=emumba-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=67/hPuPOrIMwfrb5cwvWLxAILqwcvuZTYJvgWFpLXB0=; b=j55vak1QkROGqpw8U9Npxk1xzK5z+42VjB3MbLVIYhAQjjUTkKAqJq9inpAtm9xvJN G1cVGXmpfDuthNhgFjRBK2BkIkLozEedl/+ZbS20xNpN7qp8wwum4kqrdFtrAfhLMLNz ElPAKyjeATWcJkfIU9OLLXRonTFRnYK8KzslEf6XgMbHqPSKAVZYSXrGkAfxgxgy+1xO S8xM01EjasvvgMmNaBUyLUBCv2nr2R/L5emZFVIKs7Gyj2SLqJs03usGUQ/3wTYsFHDB i9CiDg/ruTaDfvrAWsOvFgbkuIJYYKBvdWQf+rbZQYvbj2BCkI2c1ee24mtnMrn6DaF9 cqpw== 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; bh=67/hPuPOrIMwfrb5cwvWLxAILqwcvuZTYJvgWFpLXB0=; b=oJjNLohJmiLZJxOT9ChdVxd5w2BgRU8DAyL3zefRWTG5d3QtG5DShHLgICAHPTbfCZ fiFSUpqa8PXWmVgWlMOaujaZdNzPtCx78je40BhzaztheSNdZx1R0lDaxLcCuESZ7nTM wjv+qjkvsgvkMCTrf0ken1/pnpFHkbUZXA6n1S/HHPtl3Ha9nzXO2vHGQr3L1VKSIupM L+3k2FoR9gpwDzmFXYbCvFfToh1cKOnCFtmcL2sm2f8f1ITakiBFmsvmKbsqvR/1CHY7 oZgJKNQ3pRa7TKCWRGFE9oQuNUTxVPjebFV143vCXB+/Ri51zQpArA8a1ZUej7lzomYq q+Dg== X-Gm-Message-State: AOAM5332iycDZ2tT102AgpXkuUT27NeQo7mZY6RbINCMN3LskCCvSgIM +2dXX/gn0nqwHH1RdfjUihS0Pw== X-Google-Smtp-Source: ABdhPJyQKqR+jul32he71iZLcVVjFud5XWEFkP40G78xR3sqa4Z3fDTUkGGvY9mhTgD6QIquS/dY1w== X-Received: by 2002:a5d:5450:: with SMTP id w16mr2663490wrv.425.1605082550090; Wed, 11 Nov 2020 00:15:50 -0800 (PST) Received: from localhost.localdomain ([39.33.227.210]) by smtp.gmail.com with ESMTPSA id z3sm909539wrw.87.2020.11.11.00.15.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Nov 2020 00:15:49 -0800 (PST) From: Ibtisam Tariq To: maxime.coquelin@redhat.com, chenbo.xia@intel.com, cristian.dumitrescu@intel.com, jasvinder.singh@intel.com, john.mcnamara@intel.com, reshma.pattan@intel.com, konstantin.ananyev@intel.com, marko.kovacevic@intel.com Cc: dev@dpdk.org, Ibtisam Tariq , ian.betts@intel.com Date: Wed, 11 Nov 2020 08:15:04 +0000 Message-Id: <20201111081507.19913-4-ibtisam.tariq@emumba.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201111081507.19913-1-ibtisam.tariq@emumba.com> References: <20201111081507.19913-1-ibtisam.tariq@emumba.com> Subject: [dpdk-dev] [PATCH 4/7] examples/performance-thread/l3fwd-thread: enhance getopt_long usage 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" Instead of using getopt_long return value, strcmp was used to compare the input parameters with the struct option array. This patch get rid of all those strcmp by directly binding each longopt with an int enum. This is to improve readability and consistency in all examples. Bugzilla ID: 238 Cc: ian.betts@intel.com Reported-by: David Marchand Signed-off-by: Ibtisam Tariq --- v2 * Remove extra indentations. * Remove extra block brackets in switch statement. * Change enum names to start with OPT_ and remove KEYWORD from enum names. v1 * enhance getopt_long usage --- .../performance-thread/l3fwd-thread/main.c | 210 +++++++++--------- 1 file changed, 106 insertions(+), 104 deletions(-) diff --git a/examples/performance-thread/l3fwd-thread/main.c b/examples/performance-thread/l3fwd-thread/main.c index 7bf61db6b..c75d2a4a3 100644 --- a/examples/performance-thread/l3fwd-thread/main.c +++ b/examples/performance-thread/l3fwd-thread/main.c @@ -2858,18 +2858,28 @@ parse_eth_dest(const char *optarg) dest[c] = peer_addr[c]; *(uint64_t *)(val_eth + portid) = dest_eth_addr[portid]; } - -#define CMD_LINE_OPT_RX_CONFIG "rx" -#define CMD_LINE_OPT_TX_CONFIG "tx" -#define CMD_LINE_OPT_STAT_LCORE "stat-lcore" -#define CMD_LINE_OPT_ETH_DEST "eth-dest" -#define CMD_LINE_OPT_NO_NUMA "no-numa" -#define CMD_LINE_OPT_IPV6 "ipv6" -#define CMD_LINE_OPT_ENABLE_JUMBO "enable-jumbo" -#define CMD_LINE_OPT_HASH_ENTRY_NUM "hash-entry-num" -#define CMD_LINE_OPT_NO_LTHREADS "no-lthreads" -#define CMD_LINE_OPT_PARSE_PTYPE "parse-ptype" - +enum { +#define OPT_RX_CONFIG "rx" + OPT_RX_CONFIG_NUM = 256, +#define OPT_TX_CONFIG "tx" + OPT_TX_CONFIG_NUM, +#define OPT_STAT_LCORE "stat-lcore" + OPT_STAT_LCORE_NUM, +#define OPT_ETH_DEST "eth-dest" + OPT_ETH_DEST_NUM, +#define OPT_NO_NUMA "no-numa" + OPT_NO_NUMA_NUM, +#define OPT_IPV6 "ipv6" + OPT_IPV6_NUM, +#define OPT_ENABLE_JUMBO "enable-jumbo" + OPT_ENABLE_JUMBO_NUM, +#define OPT_HASH_ENTRY_NUM "hash-entry-num" + OPT_HASH_ENTRY_NUM_NUM, +#define OPT_NO_LTHREADS "no-lthreads" + OPT_NO_LTHREADS_NUM, +#define OPT_PARSE_PTYPE "parse-ptype" + OPT_PARSE_PTYPE_NUM, +}; /* Parse the argument given in the command line of the application */ static int parse_args(int argc, char **argv) @@ -2879,17 +2889,17 @@ parse_args(int argc, char **argv) int option_index; char *prgname = argv[0]; static struct option lgopts[] = { - {CMD_LINE_OPT_RX_CONFIG, 1, 0, 0}, - {CMD_LINE_OPT_TX_CONFIG, 1, 0, 0}, - {CMD_LINE_OPT_STAT_LCORE, 1, 0, 0}, - {CMD_LINE_OPT_ETH_DEST, 1, 0, 0}, - {CMD_LINE_OPT_NO_NUMA, 0, 0, 0}, - {CMD_LINE_OPT_IPV6, 0, 0, 0}, - {CMD_LINE_OPT_ENABLE_JUMBO, 0, 0, 0}, - {CMD_LINE_OPT_HASH_ENTRY_NUM, 1, 0, 0}, - {CMD_LINE_OPT_NO_LTHREADS, 0, 0, 0}, - {CMD_LINE_OPT_PARSE_PTYPE, 0, 0, 0}, - {NULL, 0, 0, 0} + {OPT_RX_CONFIG, 1, NULL, OPT_RX_CONFIG_NUM }, + {OPT_TX_CONFIG, 1, NULL, OPT_TX_CONFIG_NUM }, + {OPT_STAT_LCORE, 1, NULL, OPT_STAT_LCORE_NUM }, + {OPT_ETH_DEST, 1, NULL, OPT_ETH_DEST_NUM }, + {OPT_NO_NUMA, 0, NULL, OPT_NO_NUMA_NUM }, + {OPT_IPV6, 0, NULL, OPT_IPV6_NUM }, + {OPT_ENABLE_JUMBO, 0, NULL, OPT_ENABLE_JUMBO_NUM }, + {OPT_HASH_ENTRY_NUM, 1, NULL, OPT_HASH_ENTRY_NUM_NUM }, + {OPT_NO_LTHREADS, 0, NULL, OPT_NO_LTHREADS_NUM }, + {OPT_PARSE_PTYPE, 0, NULL, OPT_PARSE_PTYPE_NUM }, + {NULL, 0, 0, 0 } }; argvopt = argv; @@ -2907,112 +2917,104 @@ parse_args(int argc, char **argv) return -1; } break; + case 'P': printf("Promiscuous mode selected\n"); promiscuous_on = 1; break; /* long options */ - case 0: - if (!strncmp(lgopts[option_index].name, CMD_LINE_OPT_RX_CONFIG, - sizeof(CMD_LINE_OPT_RX_CONFIG))) { - ret = parse_rx_config(optarg); - if (ret) { - printf("invalid rx-config\n"); - print_usage(prgname); - return -1; - } + case OPT_RX_CONFIG_NUM: + ret = parse_rx_config(optarg); + if (ret) { + printf("invalid rx-config\n"); + print_usage(prgname); + return -1; } + break; - if (!strncmp(lgopts[option_index].name, CMD_LINE_OPT_TX_CONFIG, - sizeof(CMD_LINE_OPT_TX_CONFIG))) { - ret = parse_tx_config(optarg); - if (ret) { - printf("invalid tx-config\n"); - print_usage(prgname); - return -1; - } + case OPT_TX_CONFIG_NUM: + ret = parse_tx_config(optarg); + if (ret) { + printf("invalid tx-config\n"); + print_usage(prgname); + return -1; } + break; #if (APP_CPU_LOAD > 0) - if (!strncmp(lgopts[option_index].name, CMD_LINE_OPT_STAT_LCORE, - sizeof(CMD_LINE_OPT_STAT_LCORE))) { - cpu_load_lcore_id = parse_stat_lcore(optarg); - } + case OPT_STAT_LCORE_NUM: + cpu_load_lcore_id = parse_stat_lcore(optarg); + break; #endif - if (!strncmp(lgopts[option_index].name, CMD_LINE_OPT_ETH_DEST, - sizeof(CMD_LINE_OPT_ETH_DEST))) - parse_eth_dest(optarg); + case OPT_ETH_DEST_NUM: + parse_eth_dest(optarg); + break; - if (!strncmp(lgopts[option_index].name, CMD_LINE_OPT_NO_NUMA, - sizeof(CMD_LINE_OPT_NO_NUMA))) { - printf("numa is disabled\n"); - numa_on = 0; - } + case OPT_NO_NUMA_NUM: + printf("numa is disabled\n"); + numa_on = 0; + break; #if (APP_LOOKUP_METHOD == APP_LOOKUP_EXACT_MATCH) - if (!strncmp(lgopts[option_index].name, CMD_LINE_OPT_IPV6, - sizeof(CMD_LINE_OPT_IPV6))) { - printf("ipv6 is specified\n"); - ipv6 = 1; - } + case OPT_IPV6_NUM: + printf("ipv6 is specified\n"); + ipv6 = 1; + break; #endif - if (!strncmp(lgopts[option_index].name, CMD_LINE_OPT_NO_LTHREADS, - sizeof(CMD_LINE_OPT_NO_LTHREADS))) { - printf("l-threads model is disabled\n"); - lthreads_on = 0; - } + case OPT_NO_LTHREADS_NUM: + printf("l-threads model is disabled\n"); + lthreads_on = 0; + break; - if (!strncmp(lgopts[option_index].name, CMD_LINE_OPT_PARSE_PTYPE, - sizeof(CMD_LINE_OPT_PARSE_PTYPE))) { - printf("software packet type parsing enabled\n"); - parse_ptype_on = 1; - } + case OPT_PARSE_PTYPE_NUM: + printf("software packet type parsing enabled\n"); + parse_ptype_on = 1; + break; - if (!strncmp(lgopts[option_index].name, CMD_LINE_OPT_ENABLE_JUMBO, - sizeof(CMD_LINE_OPT_ENABLE_JUMBO))) { - struct option lenopts = {"max-pkt-len", required_argument, 0, - 0}; - - printf("jumbo frame is enabled - disabling simple TX path\n"); - port_conf.rxmode.offloads |= - DEV_RX_OFFLOAD_JUMBO_FRAME; - port_conf.txmode.offloads |= - DEV_TX_OFFLOAD_MULTI_SEGS; - - /* if no max-pkt-len set, use the default value - * RTE_ETHER_MAX_LEN - */ - if (0 == getopt_long(argc, argvopt, "", &lenopts, - &option_index)) { - - ret = parse_max_pkt_len(optarg); - if ((ret < 64) || (ret > MAX_JUMBO_PKT_LEN)) { - printf("invalid packet length\n"); - print_usage(prgname); - return -1; - } - port_conf.rxmode.max_rx_pkt_len = ret; - } - printf("set jumbo frame max packet length to %u\n", - (unsigned int)port_conf.rxmode.max_rx_pkt_len); - } -#if (APP_LOOKUP_METHOD == APP_LOOKUP_EXACT_MATCH) - if (!strncmp(lgopts[option_index].name, CMD_LINE_OPT_HASH_ENTRY_NUM, - sizeof(CMD_LINE_OPT_HASH_ENTRY_NUM))) { - ret = parse_hash_entry_number(optarg); - if ((ret > 0) && (ret <= L3FWD_HASH_ENTRIES)) { - hash_entry_number = ret; - } else { - printf("invalid hash entry number\n"); + case OPT_ENABLE_JUMBO_NUM: + { + struct option lenopts = {"max-pkt-len", + required_argument, 0, 0}; + + printf("jumbo frame is enabled - disabling simple TX path\n"); + port_conf.rxmode.offloads |= + DEV_RX_OFFLOAD_JUMBO_FRAME; + port_conf.txmode.offloads |= + DEV_TX_OFFLOAD_MULTI_SEGS; + + /* if no max-pkt-len set, use the default value + * RTE_ETHER_MAX_LEN + */ + if (0 == getopt_long(argc, argvopt, "", &lenopts, + &option_index)) { + + ret = parse_max_pkt_len(optarg); + if ((ret < 64) || (ret > MAX_JUMBO_PKT_LEN)) { + printf("invalid packet length\n"); print_usage(prgname); return -1; } + port_conf.rxmode.max_rx_pkt_len = ret; } -#endif + printf("set jumbo frame max packet length to %u\n", + (unsigned int)port_conf.rxmode.max_rx_pkt_len); break; + } +#if (APP_LOOKUP_METHOD == APP_LOOKUP_EXACT_MATCH) + case OPT_HASH_ENTRY_NUM_NUM: + ret = parse_hash_entry_number(optarg); + if ((ret > 0) && (ret <= L3FWD_HASH_ENTRIES)) { + hash_entry_number = ret; + } else { + printf("invalid hash entry number\n"); + print_usage(prgname); + return -1; + } + break; +#endif default: print_usage(prgname); -- 2.17.1