perf jevents: Parse eventcode as number
The next patch needs to modify event code. Previously eventcode was just passed through as a string. Now parse it as a number. v2: Don't special case 0 Signed-off-by: Andi Kleen <ak@linux.intel.com> Acked-by: Jiri Olsa <jolsa@kernel.org> Link: http://lkml.kernel.org/r/20170128020345.19007-2-andi@firstfloor.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
parent
4d416436f3
commit
d581141970
|
@ -135,7 +135,6 @@ static struct field {
|
||||||
const char *field;
|
const char *field;
|
||||||
const char *kernel;
|
const char *kernel;
|
||||||
} fields[] = {
|
} fields[] = {
|
||||||
{ "EventCode", "event=" },
|
|
||||||
{ "UMask", "umask=" },
|
{ "UMask", "umask=" },
|
||||||
{ "CounterMask", "cmask=" },
|
{ "CounterMask", "cmask=" },
|
||||||
{ "Invert", "inv=" },
|
{ "Invert", "inv=" },
|
||||||
|
@ -343,6 +342,7 @@ int json_events(const char *fn,
|
||||||
jsmntok_t *tokens, *tok;
|
jsmntok_t *tokens, *tok;
|
||||||
int i, j, len;
|
int i, j, len;
|
||||||
char *map;
|
char *map;
|
||||||
|
char buf[128];
|
||||||
|
|
||||||
if (!fn)
|
if (!fn)
|
||||||
return -ENOENT;
|
return -ENOENT;
|
||||||
|
@ -356,6 +356,7 @@ int json_events(const char *fn,
|
||||||
char *event = NULL, *desc = NULL, *name = NULL;
|
char *event = NULL, *desc = NULL, *name = NULL;
|
||||||
char *long_desc = NULL;
|
char *long_desc = NULL;
|
||||||
char *extra_desc = NULL;
|
char *extra_desc = NULL;
|
||||||
|
unsigned long long eventcode = 0;
|
||||||
struct msrmap *msr = NULL;
|
struct msrmap *msr = NULL;
|
||||||
jsmntok_t *msrval = NULL;
|
jsmntok_t *msrval = NULL;
|
||||||
jsmntok_t *precise = NULL;
|
jsmntok_t *precise = NULL;
|
||||||
|
@ -376,6 +377,11 @@ int json_events(const char *fn,
|
||||||
nz = !json_streq(map, val, "0");
|
nz = !json_streq(map, val, "0");
|
||||||
if (match_field(map, field, nz, &event, val)) {
|
if (match_field(map, field, nz, &event, val)) {
|
||||||
/* ok */
|
/* ok */
|
||||||
|
} else if (json_streq(map, field, "EventCode")) {
|
||||||
|
char *code = NULL;
|
||||||
|
addfield(map, &code, "", "", val);
|
||||||
|
eventcode |= strtoul(code, NULL, 0);
|
||||||
|
free(code);
|
||||||
} else if (json_streq(map, field, "EventName")) {
|
} else if (json_streq(map, field, "EventName")) {
|
||||||
addfield(map, &name, "", "", val);
|
addfield(map, &name, "", "", val);
|
||||||
} else if (json_streq(map, field, "BriefDescription")) {
|
} else if (json_streq(map, field, "BriefDescription")) {
|
||||||
|
@ -410,6 +416,8 @@ int json_events(const char *fn,
|
||||||
addfield(map, &extra_desc, " ",
|
addfield(map, &extra_desc, " ",
|
||||||
"(Precise event)", NULL);
|
"(Precise event)", NULL);
|
||||||
}
|
}
|
||||||
|
snprintf(buf, sizeof buf, "event=%#llx", eventcode);
|
||||||
|
addfield(map, &event, ",", buf, NULL);
|
||||||
if (desc && extra_desc)
|
if (desc && extra_desc)
|
||||||
addfield(map, &desc, " ", extra_desc, NULL);
|
addfield(map, &desc, " ", extra_desc, NULL);
|
||||||
if (long_desc && extra_desc)
|
if (long_desc && extra_desc)
|
||||||
|
|
Loading…
Reference in a new issue