Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d5811419 authored by Andi Kleen's avatar Andi Kleen Committed by Arnaldo Carvalho de Melo
Browse files

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: default avatarAndi Kleen <ak@linux.intel.com>
Acked-by: default avatarJiri Olsa <jolsa@kernel.org>
Link: http://lkml.kernel.org/r/20170128020345.19007-2-andi@firstfloor.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 4d416436

tools/perf/pmu-events/jevents.c

+9 −1
Original line number Diff line number Diff line
@@ -135,7 +135,6 @@ static struct field { 
	const char *field;

	const char *kernel;

} fields[] = {

	{ "EventCode",	"event=" },

	{ "UMask",	"umask=" },

	{ "CounterMask", "cmask=" },

	{ "Invert",	"inv=" },
@@ -343,6 +342,7 @@ int json_events(const char *fn, 
	jsmntok_t *tokens, *tok;

	int i, j, len;

	char *map;

	char buf[128];



	if (!fn)

		return -ENOENT;
@@ -356,6 +356,7 @@ int json_events(const char *fn, 
		char *event = NULL, *desc = NULL, *name = NULL;

		char *long_desc = NULL;

		char *extra_desc = NULL;

		unsigned long long eventcode = 0;

		struct msrmap *msr = NULL;

		jsmntok_t *msrval = NULL;

		jsmntok_t *precise = NULL;
@@ -376,6 +377,11 @@ int json_events(const char *fn, 
			nz = !json_streq(map, val, "0");

			if (match_field(map, field, nz, &event, val)) {

				/* 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")) {

				addfield(map, &name, "", "", val);

			} else if (json_streq(map, field, "BriefDescription")) {
@@ -410,6 +416,8 @@ int json_events(const char *fn, 
				addfield(map, &extra_desc, " ",

						"(Precise event)", NULL);

		}

		snprintf(buf, sizeof buf, "event=%#llx", eventcode);

		addfield(map, &event, ",", buf, NULL);

		if (desc && extra_desc)

			addfield(map, &desc, " ", extra_desc, NULL);

		if (long_desc && extra_desc)