[4/8] examples/performance-thread/l3fwd-thread: enhance getopt_long usage
diff mbox series

Message ID 20201029125339.30916-4-ibtisam.tariq@emumba.com
State Changes Requested
Delegated to: David Marchand
Headers show
Series
  • [1/8] examples/fips_validation: enhance getopt_long usage
Related show

Checks

Context Check Description
ci/checkpatch warning coding style issues

Commit Message

Ibtisam Tariq Oct. 29, 2020, 12:53 p.m. UTC
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.

Bugzilla ID: 238
Fixes: d48415e1fe ("examples/performance-thread: add l3fwd-thread app")
Cc: ian.betts@intel.com

Reported-by: David Marchand <david.marchand@redhat.com>
Signed-off-by: Ibtisam Tariq <ibtisam.tariq@emumba.com>
---
 .../performance-thread/l3fwd-thread/main.c    | 221 ++++++++++--------
 1 file changed, 121 insertions(+), 100 deletions(-)

Patch
diff mbox series

diff --git a/examples/performance-thread/l3fwd-thread/main.c b/examples/performance-thread/l3fwd-thread/main.c
index e96076f29..3de33438f 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];
 }
-
+enum {
 #define CMD_LINE_OPT_RX_CONFIG "rx"
+	CMD_LINE_OPT_RX_CONFIG_NUM = 256,
 #define CMD_LINE_OPT_TX_CONFIG "tx"
+	CMD_LINE_OPT_TX_CONFIG_NUM,
 #define CMD_LINE_OPT_STAT_LCORE "stat-lcore"
+	CMD_LINE_OPT_STAT_LCORE_NUM,
 #define CMD_LINE_OPT_ETH_DEST "eth-dest"
+	CMD_LINE_OPT_ETH_DEST_NUM,
 #define CMD_LINE_OPT_NO_NUMA "no-numa"
+	CMD_LINE_OPT_NO_NUMA_NUM,
 #define CMD_LINE_OPT_IPV6 "ipv6"
+	CMD_LINE_OPT_IPV6_NUM,
 #define CMD_LINE_OPT_ENABLE_JUMBO "enable-jumbo"
+	CMD_LINE_OPT_ENABLE_JUMBO_NUM,
 #define CMD_LINE_OPT_HASH_ENTRY_NUM "hash-entry-num"
+	CMD_LINE_OPT_HASH_ENTRY_NUM_NUM,
 #define CMD_LINE_OPT_NO_LTHREADS "no-lthreads"
+	CMD_LINE_OPT_NO_LTHREADS_NUM,
 #define CMD_LINE_OPT_PARSE_PTYPE "parse-ptype"
-
+	CMD_LINE_OPT_PARSE_PTYPE_NUM,
+};
 /* Parse the argument given in the command line of the application */
 static int
 parse_args(int argc, char **argv)
@@ -2879,16 +2889,26 @@  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},
+		{CMD_LINE_OPT_RX_CONFIG, 1,
+				NULL, CMD_LINE_OPT_RX_CONFIG_NUM},
+		{CMD_LINE_OPT_TX_CONFIG, 1,
+				NULL, CMD_LINE_OPT_TX_CONFIG_NUM},
+		{CMD_LINE_OPT_STAT_LCORE, 1,
+				NULL, CMD_LINE_OPT_STAT_LCORE_NUM},
+		{CMD_LINE_OPT_ETH_DEST, 1,
+				NULL, CMD_LINE_OPT_ETH_DEST_NUM},
+		{CMD_LINE_OPT_NO_NUMA, 0,
+				NULL, CMD_LINE_OPT_NO_NUMA_NUM},
+		{CMD_LINE_OPT_IPV6, 0,
+				NULL, CMD_LINE_OPT_IPV6_NUM},
+		{CMD_LINE_OPT_ENABLE_JUMBO, 0,
+				NULL, CMD_LINE_OPT_ENABLE_JUMBO_NUM},
+		{CMD_LINE_OPT_HASH_ENTRY_NUM, 1,
+				NULL, CMD_LINE_OPT_HASH_ENTRY_NUM_NUM},
+		{CMD_LINE_OPT_NO_LTHREADS, 0,
+				NULL, CMD_LINE_OPT_NO_LTHREADS_NUM},
+		{CMD_LINE_OPT_PARSE_PTYPE, 0,
+				NULL, CMD_LINE_OPT_PARSE_PTYPE_NUM},
 		{NULL, 0, 0, 0}
 	};
 
@@ -2913,107 +2933,108 @@  parse_args(int argc, char **argv)
 			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 CMD_LINE_OPT_RX_CONFIG_NUM:
+		{
+			ret = parse_rx_config(optarg);
+			if (ret) {
+				printf("invalid rx-config\n");
+				print_usage(prgname);
+				return -1;
 			}
-
-			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;
-				}
+			break;
+		}
+		case CMD_LINE_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 CMD_LINE_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);
-
-			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 CMD_LINE_OPT_ETH_DEST_NUM:
+		{
+			parse_eth_dest(optarg);
+			break;
+		}
+		case CMD_LINE_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 CMD_LINE_OPT_IPV6_NUM:
+		{
+			printf("ipv6 is specified\n");
+			ipv6 = 1;
+			break;
+		}
 #endif
+		case CMD_LINE_OPT_NO_LTHREADS_NUM:
+		{
+			printf("l-threads model is disabled\n");
+			lthreads_on = 0;
+			break;
+		}
+		case CMD_LINE_OPT_PARSE_PTYPE_NUM:
+		{
+			printf("software packet type parsing enabled\n");
+			parse_ptype_on = 1;
+			break;
+		}
+		case CMD_LINE_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)) {
 
-			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;
-			}
-
-			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;
-			}
-
-			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");
+				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 CMD_LINE_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);
 			return -1;