[v4,8/8] examples/l3fwd-power: update to call arg parser API
Checks
Commit Message
Update to the l3fwd-power example application to call the arg parser
library for its 'combined core string parser' instead of implementing its
own corelist parser. The default_type passed into the function call is
a corelist.
Signed-off-by: Euan Bourke <euan.bourke@intel.com>
Acked-by: David Hunt <david.hunt@intel.com>
---
examples/l3fwd-power/perf_core.c | 52 ++++++--------------------------
1 file changed, 9 insertions(+), 43 deletions(-)
Comments
[AMD Official Use Only - General]
> -----Original Message-----
> From: Euan Bourke <euan.bourke@intel.com>
> Sent: Friday, December 15, 2023 10:57 PM
> To: dev@dpdk.org
> Cc: Euan Bourke <euan.bourke@intel.com>; David Hunt <david.hunt@intel.com>;
> Anatoly Burakov <anatoly.burakov@intel.com>; Tummala, Sivaprasad
> <Sivaprasad.Tummala@amd.com>
> Subject: [PATCH v4 8/8] examples/l3fwd-power: update to call arg parser API
>
> Caution: This message originated from an External Source. Use proper caution
> when opening attachments, clicking links, or responding.
>
>
> Update to the l3fwd-power example application to call the arg parser library for its
> 'combined core string parser' instead of implementing its own corelist parser. The
> default_type passed into the function call is a corelist.
>
> Signed-off-by: Euan Bourke <euan.bourke@intel.com>
> Acked-by: David Hunt <david.hunt@intel.com>
> ---
> examples/l3fwd-power/perf_core.c | 52 ++++++--------------------------
> 1 file changed, 9 insertions(+), 43 deletions(-)
>
> diff --git a/examples/l3fwd-power/perf_core.c b/examples/l3fwd-power/perf_core.c
> index 41ef6d0c9a..e8ed414d40 100644
> --- a/examples/l3fwd-power/perf_core.c
> +++ b/examples/l3fwd-power/perf_core.c
> @@ -12,6 +12,7 @@
> #include <rte_lcore.h>
> #include <rte_power.h>
> #include <rte_string_fns.h>
> +#include <rte_arg_parser.h>
>
> #include "perf_core.h"
> #include "main.h"
> @@ -177,56 +178,21 @@ parse_perf_config(const char *q_arg) int
> parse_perf_core_list(const char *corelist) {
> - int i, idx = 0;
> - unsigned int count = 0;
> - char *end = NULL;
> - int min, max;
> + int count;
> + uint16_t cores[RTE_MAX_LCORE];
>
> if (corelist == NULL) {
> printf("invalid core list\n");
> return -1;
> }
>
> + count = rte_arg_parse_core_string(corelist, cores, RTE_DIM(cores),
> + RTE_ARG_PARSE_TYPE_CORELIST);
>
> - /* Remove all blank characters ahead and after */
> - while (isblank(*corelist))
> - corelist++;
> - i = strlen(corelist);
> - while ((i > 0) && isblank(corelist[i - 1]))
> - i--;
> + for (int i = 0; i < count; i++)
> + hp_lcores[i] = cores[i];
>
> - /* Get list of cores */
> - min = RTE_MAX_LCORE;
> - do {
> - while (isblank(*corelist))
> - corelist++;
> - if (*corelist == '\0')
> - return -1;
> - errno = 0;
> - idx = strtoul(corelist, &end, 10);
> - if (errno || end == NULL)
> - return -1;
> - while (isblank(*end))
> - end++;
> - if (*end == '-') {
> - min = idx;
> - } else if ((*end == ',') || (*end == '\0')) {
> - max = idx;
> - if (min == RTE_MAX_LCORE)
> - min = idx;
> - for (idx = min; idx <= max; idx++) {
> - hp_lcores[count] = idx;
> - count++;
> - }
> - min = RTE_MAX_LCORE;
> - } else {
> - printf("invalid core list\n");
> - return -1;
> - }
> - corelist = end + 1;
> - } while (*end != '\0');
> -
> - if (count == 0) {
> + if (count == 0 || count == -1) {
> printf("invalid core list\n");
> return -1;
> }
> @@ -234,7 +200,7 @@ parse_perf_core_list(const char *corelist)
> nb_hp_lcores = count;
>
> printf("Configured %d high performance cores\n", nb_hp_lcores);
> - for (i = 0; i < nb_hp_lcores; i++)
> + for (int i = 0; i < nb_hp_lcores; i++)
> printf("\tHigh performance core %d %d\n",
> i, hp_lcores[i]);
>
> --
> 2.34.1
Acked-by: Sivaprasad Tummala <sivaprasad.tummala@amd.com>
@@ -12,6 +12,7 @@
#include <rte_lcore.h>
#include <rte_power.h>
#include <rte_string_fns.h>
+#include <rte_arg_parser.h>
#include "perf_core.h"
#include "main.h"
@@ -177,56 +178,21 @@ parse_perf_config(const char *q_arg)
int
parse_perf_core_list(const char *corelist)
{
- int i, idx = 0;
- unsigned int count = 0;
- char *end = NULL;
- int min, max;
+ int count;
+ uint16_t cores[RTE_MAX_LCORE];
if (corelist == NULL) {
printf("invalid core list\n");
return -1;
}
+ count = rte_arg_parse_core_string(corelist, cores, RTE_DIM(cores),
+ RTE_ARG_PARSE_TYPE_CORELIST);
- /* Remove all blank characters ahead and after */
- while (isblank(*corelist))
- corelist++;
- i = strlen(corelist);
- while ((i > 0) && isblank(corelist[i - 1]))
- i--;
+ for (int i = 0; i < count; i++)
+ hp_lcores[i] = cores[i];
- /* Get list of cores */
- min = RTE_MAX_LCORE;
- do {
- while (isblank(*corelist))
- corelist++;
- if (*corelist == '\0')
- return -1;
- errno = 0;
- idx = strtoul(corelist, &end, 10);
- if (errno || end == NULL)
- return -1;
- while (isblank(*end))
- end++;
- if (*end == '-') {
- min = idx;
- } else if ((*end == ',') || (*end == '\0')) {
- max = idx;
- if (min == RTE_MAX_LCORE)
- min = idx;
- for (idx = min; idx <= max; idx++) {
- hp_lcores[count] = idx;
- count++;
- }
- min = RTE_MAX_LCORE;
- } else {
- printf("invalid core list\n");
- return -1;
- }
- corelist = end + 1;
- } while (*end != '\0');
-
- if (count == 0) {
+ if (count == 0 || count == -1) {
printf("invalid core list\n");
return -1;
}
@@ -234,7 +200,7 @@ parse_perf_core_list(const char *corelist)
nb_hp_lcores = count;
printf("Configured %d high performance cores\n", nb_hp_lcores);
- for (i = 0; i < nb_hp_lcores; i++)
+ for (int i = 0; i < nb_hp_lcores; i++)
printf("\tHigh performance core %d %d\n",
i, hp_lcores[i]);