* [dpdk-dev] [PATCH 1/1] ip_pipeline: fixed parsing cpu cores
@ 2015-07-21 14:39 Maciej Gajdzica
2015-07-21 15:35 ` Dumitrescu, Cristian
0 siblings, 1 reply; 3+ messages in thread
From: Maciej Gajdzica @ 2015-07-21 14:39 UTC (permalink / raw)
To: dev
This patch fixes parsing value of core variable in pipeline config.
Before not every combination of cores (c), sockets (s) and
hyperthreading (h) was parsed correctly.
Signed-off-by: Maciej Gajdzica <maciejx.t.gajdzica@intel.com>
---
examples/ip_pipeline/config_parse.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/examples/ip_pipeline/config_parse.c b/examples/ip_pipeline/config_parse.c
index 361bf8a..c9b78f9 100644
--- a/examples/ip_pipeline/config_parse.c
+++ b/examples/ip_pipeline/config_parse.c
@@ -386,14 +386,14 @@ parse_pipeline_core(uint32_t *socket,
switch (type) {
case 's':
case 'S':
- if (s_parsed)
+ if (s_parsed || c_parsed || h_parsed)
return -EINVAL;
s_parsed = 1;
next++;
break;
case 'c':
case 'C':
- if (c_parsed)
+ if (c_parsed || h_parsed)
return -EINVAL;
c_parsed = 1;
next++;
@@ -423,7 +423,10 @@ parse_pipeline_core(uint32_t *socket,
num[num_len] = *next;
}
- if (num_len == 0 && type != 'h')
+ if (num_len == 0 && type != 'h' && type != 'H')
+ return -EINVAL;
+
+ if (num_len != 0 && (type == 'h' || type == 'H'))
return -EINVAL;
num[num_len] = '\0';
@@ -438,9 +441,6 @@ parse_pipeline_core(uint32_t *socket,
case 'c':
case 'C':
c = val;
- if (type == 'C' && *next != '\0')
- return -EINVAL;
-
break;
case 'h':
case 'H':
--
1.7.9.5
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [dpdk-dev] [PATCH 1/1] ip_pipeline: fixed parsing cpu cores
2015-07-21 14:39 [dpdk-dev] [PATCH 1/1] ip_pipeline: fixed parsing cpu cores Maciej Gajdzica
@ 2015-07-21 15:35 ` Dumitrescu, Cristian
2015-07-27 13:50 ` Thomas Monjalon
0 siblings, 1 reply; 3+ messages in thread
From: Dumitrescu, Cristian @ 2015-07-21 15:35 UTC (permalink / raw)
To: Gajdzica, MaciejX T, dev
> -----Original Message-----
> From: dev [mailto:dev-bounces@dpdk.org] On Behalf Of Maciej Gajdzica
> Sent: Tuesday, July 21, 2015 3:39 PM
> To: dev@dpdk.org
> Subject: [dpdk-dev] [PATCH 1/1] ip_pipeline: fixed parsing cpu cores
>
> This patch fixes parsing value of core variable in pipeline config.
> Before not every combination of cores (c), sockets (s) and
> hyperthreading (h) was parsed correctly.
>
> Signed-off-by: Maciej Gajdzica <maciejx.t.gajdzica@intel.com>
> ---
> examples/ip_pipeline/config_parse.c | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/examples/ip_pipeline/config_parse.c
> b/examples/ip_pipeline/config_parse.c
> index 361bf8a..c9b78f9 100644
> --- a/examples/ip_pipeline/config_parse.c
> +++ b/examples/ip_pipeline/config_parse.c
> @@ -386,14 +386,14 @@ parse_pipeline_core(uint32_t *socket,
> switch (type) {
> case 's':
> case 'S':
> - if (s_parsed)
> + if (s_parsed || c_parsed || h_parsed)
> return -EINVAL;
> s_parsed = 1;
> next++;
> break;
> case 'c':
> case 'C':
> - if (c_parsed)
> + if (c_parsed || h_parsed)
> return -EINVAL;
> c_parsed = 1;
> next++;
> @@ -423,7 +423,10 @@ parse_pipeline_core(uint32_t *socket,
> num[num_len] = *next;
> }
>
> - if (num_len == 0 && type != 'h')
> + if (num_len == 0 && type != 'h' && type != 'H')
> + return -EINVAL;
> +
> + if (num_len != 0 && (type == 'h' || type == 'H'))
> return -EINVAL;
>
> num[num_len] = '\0';
> @@ -438,9 +441,6 @@ parse_pipeline_core(uint32_t *socket,
> case 'c':
> case 'C':
> c = val;
> - if (type == 'C' && *next != '\0')
> - return -EINVAL;
> -
> break;
> case 'h':
> case 'H':
> --
> 1.7.9.5
Acked-by: Cristian Dumitrescu <cristian.dumitrescu@intel.com>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [dpdk-dev] [PATCH 1/1] ip_pipeline: fixed parsing cpu cores
2015-07-21 15:35 ` Dumitrescu, Cristian
@ 2015-07-27 13:50 ` Thomas Monjalon
0 siblings, 0 replies; 3+ messages in thread
From: Thomas Monjalon @ 2015-07-27 13:50 UTC (permalink / raw)
To: Gajdzica, MaciejX T; +Cc: dev
> > This patch fixes parsing value of core variable in pipeline config.
> > Before not every combination of cores (c), sockets (s) and
> > hyperthreading (h) was parsed correctly.
> >
> > Signed-off-by: Maciej Gajdzica <maciejx.t.gajdzica@intel.com>
>
> Acked-by: Cristian Dumitrescu <cristian.dumitrescu@intel.com>
Applied, thanks
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-07-27 13:51 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-07-21 14:39 [dpdk-dev] [PATCH 1/1] ip_pipeline: fixed parsing cpu cores Maciej Gajdzica
2015-07-21 15:35 ` Dumitrescu, Cristian
2015-07-27 13:50 ` Thomas Monjalon
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).