[dpdk-dev] [PATCH v2] app/testpmd: add portlist option to the testpmd

[Hariprasad Govindharajan <hariprasad.govindharajan@intel.com>]

        In current version, we are setting the ports
        using portmask. With portmask, we can use only
        upto 64 ports. This portlist option enables the user
        to use more than 64 ports.
        Now we can specify the ports in 2 different ways
        - Using portmask (-p [0x]nnn): mask must be in hex format
        - Using portlist in the following format
          --portlist <p1>[-p2][,p3[-p4],...]

        --portmask 0x2 is same as --portlist 1
        --portmask 0x3 is same as --portlist 0-1

Signed-off-by: Hariprasad Govindharajan <hariprasad.govindharajan@intel.com>
---
 app/test-pmd/config.c                      | 57 +++++++++++++++++++++++++++++-
 lib/librte_eal/common/eal_common_options.c | 45 ++++++++++-------------
 lib/librte_eal/common/include/rte_eal.h    | 34 ------------------
 lib/librte_eal/rte_eal_version.map         |  1 -
 4 files changed, 74 insertions(+), 63 deletions(-)

diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c
index 49662cf..c10aa78 100644
--- a/app/test-pmd/config.c
+++ b/app/test-pmd/config.c
@@ -2587,6 +2587,61 @@ set_fwd_ports_list(unsigned int *portlist, unsigned int nb_pt)
 	}
 }
 
+static int parse_port_list(const char *list, int *values, int maxsize)
+{
+	unsigned int count = 0;
+	char *end = NULL;
+	int min, max;
+	int idx;
+
+	if (list == NULL || values == NULL || maxsize < 0)
+		return -1;
+
+	for (idx = 0; idx < maxsize; idx++)
+		values[idx] = -1;
+
+	/* Remove all blank characters ahead */
+	while (isblank(*list))
+		list++;
+
+	min = maxsize;
+
+	do {
+		while (isblank(*list))
+			list++;
+		if (*list == '\0')
+			return -1;
+		errno = 0;
+		idx = strtol(list, &end, 10);
+		if (errno || end == NULL)
+			return -1;
+		if (idx < 0 || idx >= maxsize)
+			return -1;
+		while (isblank(*end))
+			end++;
+		if (*end == '-') {
+			min = idx;
+		} else if ((*end == ',') || (*end == '\0')) {
+			max = idx;
+			if (min == maxsize)
+				min = idx;
+			for (idx = min; idx <= max; idx++) {
+				if (values[idx] == -1) {
+					values[idx] = count;
+					count++;
+				}
+			}
+			min = maxsize;
+		} else
+			return -1;
+		list = end + 1;
+	} while (*end != '\0');
+
+	if (count == 0)
+		return -1;
+	return 0;
+}
+
 void
 parse_fwd_portlist(const char *portlist)
 {
@@ -2601,7 +2656,7 @@ parse_fwd_portlist(const char *portlist)
 	 * requires a list of portids' so we use 2 arrays to do the
 	 * conversion between 2 formats.
 	 */
-	if (eal_parse_optionlist(portlist, portindex, RTE_MAX_ETHPORTS) < 0)
+	if (parse_port_list(portlist, portindex, RTE_MAX_ETHPORTS) < 0)
 		rte_exit(EXIT_FAILURE, "Invalid fwd port list\n");
 
 	RTE_ETH_FOREACH_DEV(idx) {
diff --git a/lib/librte_eal/common/eal_common_options.c b/lib/librte_eal/common/eal_common_options.c
index aa59f8b..5920233 100644
--- a/lib/librte_eal/common/eal_common_options.c
+++ b/lib/librte_eal/common/eal_common_options.c
@@ -571,36 +571,33 @@ eal_parse_service_corelist(const char *corelist)
 	return 0;
 }
 
-int
-eal_parse_optionlist(const char *list, int *values, int maxsize)
+static int
+eal_parse_corelist(const char *corelist, int *cores)
 {
 	unsigned count = 0;
 	char *end = NULL;
 	int min, max;
 	int idx;
 
-	if (list == NULL || values == NULL || maxsize < 0)
-		return -1;
-
-	for (idx = 0; idx < maxsize; idx++)
-		values[idx] = -1;
+	for (idx = 0; idx < RTE_MAX_LCORE; idx++)
+		cores[idx] = -1;
 
 	/* Remove all blank characters ahead */
-	while (isblank(*list))
-		list++;
-
-	min = maxsize;
+	while (isblank(*corelist))
+		corelist++;
 
+	/* Get list of cores */
+	min = RTE_MAX_LCORE;
 	do {
-		while (isblank(*list))
-			list++;
-		if (*list == '\0')
+		while (isblank(*corelist))
+			corelist++;
+		if (*corelist == '\0')
 			return -1;
 		errno = 0;
-		idx = strtol(list, &end, 10);
+		idx = strtol(corelist, &end, 10);
 		if (errno || end == NULL)
 			return -1;
-		if (idx < 0 || idx >= maxsize)
+		if (idx < 0 || idx >= RTE_MAX_LCORE)
 			return -1;
 		while (isblank(*end))
 			end++;
@@ -608,18 +605,18 @@ eal_parse_optionlist(const char *list, int *values, int maxsize)
 			min = idx;
 		} else if ((*end == ',') || (*end == '\0')) {
 			max = idx;
-			if (min == maxsize)
+			if (min == RTE_MAX_LCORE)
 				min = idx;
 			for (idx = min; idx <= max; idx++) {
-				if (values[idx] == -1) {
-					values[idx] = count;
+				if (cores[idx] == -1) {
+					cores[idx] = count;
 					count++;
 				}
 			}
-			min = maxsize;
+			min = RTE_MAX_LCORE;
 		} else
 			return -1;
-		list = end + 1;
+		corelist = end + 1;
 	} while (*end != '\0');
 
 	if (count == 0)
@@ -627,12 +624,6 @@ eal_parse_optionlist(const char *list, int *values, int maxsize)
 	return 0;
 }
 
-static int
-eal_parse_corelist(const char *corelist, int *cores)
-{
-	return eal_parse_optionlist(corelist, cores, RTE_MAX_LCORE);
-}
-
 /* Changes the lcore id of the master thread */
 static int
 eal_parse_master_lcore(const char *arg)
diff --git a/lib/librte_eal/common/include/rte_eal.h b/lib/librte_eal/common/include/rte_eal.h
index 567b754..2f9ed29 100644
--- a/lib/librte_eal/common/include/rte_eal.h
+++ b/lib/librte_eal/common/include/rte_eal.h
@@ -71,40 +71,6 @@ enum rte_proc_type_t rte_eal_process_type(void);
 int rte_eal_iopl_init(void);
 
 /**
- * Parse the user input
- *
- * This function can be used to read and parse the user input
- * from the command line. For example, when the user specifies
- * corelist or port list this function will read the input
- * and set the forwarding cores or ports
- *
- * @param[in] list
- *   String containing the user input. User can specify
- *   in these formats 1,3,5 or 1-3 or 1-2,5 or 3,5-6.
- *   For example, if the user wants to use all the available
- *   4 ports in his system, then the input can be 0-3 or 0,1,2,3.
- *   If the user wants to use only the ports 1,2 then the input
- *   is 1,2.
- *   valid characters are '-' and ','
- *   invalid chars like '.' or '#' will result in
- *   EAL: Error - exiting with code: 1
- *     Cause: Invalid fwd port list
- * @param[in] values
- *   An array pointer, used by this function to set the
- *   array contents to a positive value if they are listed
- *   in the input
- *   else sets it to -1
- * @param[in] maxsize
- *   This is the maximum value the list string can contain
- * @return
- *   -On success, returns 0.
- *   -On failure, returns -1.
- */
-__rte_experimental
-int
-eal_parse_optionlist(const char *list, int *values, int maxsize);
-
-/**
  * Initialize the Environment Abstraction Layer (EAL).
  *
  * This function is to be executed on the MASTER lcore only, as soon
diff --git a/lib/librte_eal/rte_eal_version.map b/lib/librte_eal/rte_eal_version.map
index 3d72df8..e38d025 100644
--- a/lib/librte_eal/rte_eal_version.map
+++ b/lib/librte_eal/rte_eal_version.map
@@ -332,5 +332,4 @@ EXPERIMENTAL {
 	# added in 19.11
 	rte_log_get_stream;
 	rte_mcfg_get_single_file_segments;
-	eal_parse_optionlist;
 };
-- 
2.7.4