X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=app%2Ftest-pmd%2Fparameters.c;h=7a60048617d4ce3c2c48ccb086f538d31a528c87;hb=3d349a1d35edf2cbd6c16a2c65967ec964469654;hp=18b52cc0d080d9ea24e7d804d7fa24636346c10f;hpb=ca7feb2273665ac7544979461f83dbde3ed69c22;p=dpdk.git

diff --git a/app/test-pmd/parameters.c b/app/test-pmd/parameters.c
index 18b52cc0d0..7a60048617 100644
--- a/app/test-pmd/parameters.c
+++ b/app/test-pmd/parameters.c
@@ -158,6 +158,8 @@ usage(char* progname)
 	printf("  --disable-rss: disable rss.\n");
 	printf("  --port-topology=N: set port topology (N: paired (default) or "
 	       "chained).\n");
+	printf("  --forward-mode=N: set forwarding mode (N: %s).\n",
+	       list_pkt_forwarding_modes());
 	printf("  --rss-ip: set RSS functions to IPv4/IPv6 only .\n");
 	printf("  --rss-udp: set RSS functions to IPv4/IPv6 + UDP.\n");
 	printf("  --rxq=N: set the number of RX queues per port to N.\n");
@@ -194,6 +196,9 @@ usage(char* progname)
 	       "(0 <= mapping <= %d).\n", RTE_ETHDEV_QUEUE_STAT_CNTRS - 1);
 	printf("  --no-flush-rx: Don't flush RX streams before forwarding."
 	       " Used mainly with PCAP drivers.\n");
+	printf("  --txpkts=X[,Y]*: set TX segment sizes.\n");
+	printf("  --disable-link-check: disable check on link status when "
+	       "starting/stopping ports.\n");
 }
 
 #ifdef RTE_LIBRTE_CMDLINE
@@ -475,6 +480,52 @@ parse_ringnuma_config(const char *q_arg)
 	return 0;
 }
 
+static unsigned int
+parse_item_list(char* str, unsigned int max_items, unsigned int *parsed_items)
+{
+	unsigned int nb_item;
+	unsigned int value;
+	unsigned int i;
+	int value_ok;
+	char c;
+
+	/*
+	 * First parse all items in the list and store their value.
+	 */
+	value = 0;
+	nb_item = 0;
+	value_ok = 0;
+	for (i = 0; i < strlen(str); i++) {
+		c = str[i];
+		if ((c >= '0') && (c <= '9')) {
+			value = (unsigned int) (value * 10 + (c - '0'));
+			value_ok = 1;
+			continue;
+		}
+		if (c != ',') {
+			printf("character %c is not a decimal digit\n", c);
+			return (0);
+		}
+		if (! value_ok) {
+			printf("No valid value before comma\n");
+			return (0);
+		}
+		if (nb_item < max_items) {
+			parsed_items[nb_item] = value;
+			value_ok = 0;
+			value = 0;
+		}
+		nb_item++;
+	}
+
+	if (nb_item >= max_items)
+		rte_exit(EXIT_FAILURE, "too many txpkt segments!\n");
+
+	parsed_items[nb_item++] = value;
+
+	return (nb_item);
+}
+
 void
 launch_args_parse(int argc, char** argv)
 {
@@ -515,6 +566,7 @@ launch_args_parse(int argc, char** argv)
 		{ "enable-drop-en",            0, 0, 0 },
 		{ "disable-rss",                0, 0, 0 },
 		{ "port-topology",              1, 0, 0 },
+		{ "forward-mode",               1, 0, 0 },
 		{ "rss-ip",			0, 0, 0 },
 		{ "rss-udp",			0, 0, 0 },
 		{ "rxq",			1, 0, 0 },
@@ -536,6 +588,8 @@ launch_args_parse(int argc, char** argv)
 		{ "tx-queue-stats-mapping",	1, 0, 0 },
 		{ "rx-queue-stats-mapping",	1, 0, 0 },
 		{ "no-flush-rx",	0, 0, 0 },
+		{ "txpkts",			1, 0, 0 },
+		{ "disable-link-check",		0, 0, 0 },
 		{ 0, 0, 0, 0 },
 	};
 
@@ -775,6 +829,8 @@ launch_args_parse(int argc, char** argv)
 						 " must be: paired or chained \n",
 						 optarg);
 			}
+			if (!strcmp(lgopts[opt_idx].name, "forward-mode"))
+				set_pkt_forwarding_mode(optarg);
 			if (!strcmp(lgopts[opt_idx].name, "rss-ip"))
 				rss_hf = ETH_RSS_IPV4 | ETH_RSS_IPV6;
 			if (!strcmp(lgopts[opt_idx].name, "rss-udp"))
@@ -979,8 +1035,20 @@ launch_args_parse(int argc, char** argv)
 						 "invalid RX queue statistics mapping config entered\n");
 				}
 			}
+			if (!strcmp(lgopts[opt_idx].name, "txpkts")) {
+				unsigned seg_lengths[RTE_MAX_SEGS_PER_PKT];
+				unsigned int nb_segs;
+
+				nb_segs = parse_item_list(optarg, RTE_MAX_SEGS_PER_PKT, seg_lengths);
+				if (nb_segs > 0)
+					set_tx_pkt_segments(seg_lengths, nb_segs);
+				else
+					rte_exit(EXIT_FAILURE, "bad txpkts\n");
+			}
 			if (!strcmp(lgopts[opt_idx].name, "no-flush-rx"))
 				no_flush_rx = 1;
+			if (!strcmp(lgopts[opt_idx].name, "disable-link-check"))
+				no_link_check = 1;
 
 			break;
 		case 'h':