[dpdk-dev] [PATCH] app/testpmd: list forwarding modes

Thomas Monjalon thomas.monjalon at 6wind.com
Wed May 14 19:05:13 CEST 2014


Having a function to list forwarding modes helps to show them
in cli help and in parameters usage witout duplicating code.

Signed-off-by: Thomas Monjalon <thomas.monjalon at 6wind.com>
---
 app/test-pmd/cmdline.c    | 13 +++----------
 app/test-pmd/config.c     | 20 ++++++++++++++++++++
 app/test-pmd/parameters.c |  3 ++-
 app/test-pmd/testpmd.h    |  1 +
 4 files changed, 26 insertions(+), 11 deletions(-)

This patch is based on top of "test-pmd: allow command line selection of forwarding mode".
It fixes issue raised by Bruce:
	http://dpdk.org/ml/archives/dev/2014-April/001809.html

diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index 7f59333..c81d69a 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -294,17 +294,9 @@ static void cmd_help_long_parsed(void *parsed_result,
 			"        bit 3 - insert sctp checksum offload if set\n"
 			"    Please check the NIC datasheet for HW limits.\n\n"
 
-#ifdef RTE_LIBRTE_IEEE1588
-			"set fwd (io|mac|mac_retry|rxonly|txonly|csum|ieee1588)\n"
-			"    Set IO, MAC, MAC_RETRY, RXONLY, CSUM or TXONLY or ieee1588"
-			" packet forwarding mode.\n\n"
-
-#else
-			"set fwd (io|mac|mac_retry|rxonly|txonly|csum)\n"
-			"    Set IO, MAC, MAC_RETRY, RXONLY, CSUM or TXONLY packet"
-			" forwarding mode.\n\n"
+			"set fwd (%s)\n"
+			"    Set packet forwarding mode.\n\n"
 
-#endif
 			"mac_addr add (port_id) (XX:XX:XX:XX:XX:XX)\n"
 			"    Add a MAC address on port_id.\n\n"
 
@@ -398,6 +390,7 @@ static void cmd_help_long_parsed(void *parsed_result,
 			" using the lowest port on the NIC.\n\n"
 #endif
 
+			, list_pkt_forwarding_modes()
 		);
 	}
 
diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c
index d0e21b7..8f08cc2 100644
--- a/app/test-pmd/config.c
+++ b/app/test-pmd/config.c
@@ -1231,6 +1231,26 @@ set_tx_pkt_segments(unsigned *seg_lengths, unsigned nb_segs)
 	tx_pkt_nb_segs = (uint8_t) nb_segs;
 }
 
+char*
+list_pkt_forwarding_modes(void)
+{
+	static char modes[128] = "";
+	struct fwd_engine *fwd_eng;
+	unsigned i;
+
+	if (strlen (modes) == 0) {
+		i = 0;
+		while ((fwd_eng = fwd_engines[i]) != NULL) {
+			strcat(modes, fwd_eng->fwd_mode_name);
+			strcat(modes, "|");
+			i++;
+		}
+		modes[strlen(modes) - 1] = '\0';
+	}
+
+	return modes;
+}
+
 void
 set_pkt_forwarding_mode(const char *fwd_mode_name)
 {
diff --git a/app/test-pmd/parameters.c b/app/test-pmd/parameters.c
index 67081d7..8a3ce2c 100644
--- a/app/test-pmd/parameters.c
+++ b/app/test-pmd/parameters.c
@@ -158,7 +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");
+	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");
diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h
index 52d3543..4afa793 100644
--- a/app/test-pmd/testpmd.h
+++ b/app/test-pmd/testpmd.h
@@ -491,6 +491,7 @@ void tx_cksum_set(portid_t port_id, uint8_t cksum_mask);
 void set_verbose_level(uint16_t vb_level);
 void set_tx_pkt_segments(unsigned *seg_lengths, unsigned nb_segs);
 void set_nb_pkt_per_burst(uint16_t pkt_burst);
+char* list_pkt_forwarding_modes(void);
 void set_pkt_forwarding_mode(const char *fwd_mode);
 void start_packet_forwarding(int with_tx_first);
 void stop_packet_forwarding(void);
-- 
1.9.2



More information about the dev mailing list