Re: [PATCH 02/11] perf, tools: Parse eventcode as number in jevents

From: Jiri Olsa
Date: Sun Jan 08 2017 - 13:57:54 EST


On Tue, Jan 03, 2017 at 07:08:24AM -0800, Andi Kleen wrote:
> From: Andi Kleen <ak@xxxxxxxxxxxxxxx>
>
> The next patch needs to modify event code. Previously eventcode was just
> passed through as a string. Now parse it as a number.
>
> Signed-off-by: Andi Kleen <ak@xxxxxxxxxxxxxxx>
> ---
> tools/perf/pmu-events/jevents.c | 14 +++++++++++++-
> 1 file changed, 13 insertions(+), 1 deletion(-)
>
> diff --git a/tools/perf/pmu-events/jevents.c b/tools/perf/pmu-events/jevents.c
> index 41611d7f9873..ee5eeeaed378 100644
> --- a/tools/perf/pmu-events/jevents.c
> +++ b/tools/perf/pmu-events/jevents.c
> @@ -135,7 +135,6 @@ static struct field {
> const char *field;
> const char *kernel;
> } fields[] = {
> - { "EventCode", "event=" },
> { "UMask", "umask=" },
> { "CounterMask", "cmask=" },
> { "Invert", "inv=" },
> @@ -164,6 +163,10 @@ static int match_field(char *map, jsmntok_t *field, int nz,
>
> for (f = fields; f->field; f++)
> if (json_streq(map, field, f->field) && nz) {
> + /* Handle all variations of 0 encounted in JSON */
> + if (json_streq(map, val, "0x00") ||
> + json_streq(map, val, "0x0"))
> + return 1;

how is this related to the patch? also shouldn't it return 0 ?

jirka