* perf: Add support for full Intel event lists v8
@ 2014-07-30 23:22 Andi Kleen
2014-07-30 23:22 ` [PATCH 01/10] perf, tools: Add jsmn `jasmine' JSON parser Andi Kleen
` (10 more replies)
0 siblings, 11 replies; 23+ messages in thread
From: Andi Kleen @ 2014-07-30 23:22 UTC (permalink / raw)
To: jolsa; +Cc: linux-kernel, namhyung, acme, mingo, peterz
Since it seems the download mechanism is controversal,
I removed the downloader for now until a suitable distribution
method with kernel.org can be established. This is just
the rest of the perf JSON event code that should hopefully
not be controversal.
[v2: Review feedback addressed and some minor improvements]
[v3: More review feedback addressed and handle test failures better.
Ported to latest tip/core.]
[v4: Addressed Namhyung's feedback]
[v5: Rebase to latest tree. Minor description update.]
[v6: Rebase. Add acked by from Namhyung and address feedback. Some minor
fixes. Should be good to go now I hope. The period patch was dropped,
as that is already handled. I added an extra patch for a --quiet argument
for perf list]
[v7: Address Jiri's feedback. Various changes and some patches
were split. perf download uses curl now instead of wget.]
[v8: Removed perf download for now. Port to latest tip/perf/core]
perf has high level events which are useful in many cases. However
there are some tuning situations where low level events in the CPU
are needed. Traditionally this required specifying the event in
raw form (very awkward) or using non standard frontends
like ocperf or patching in libpfm.
Intel CPUs can have very large event files (Haswell has ~336 core events,
much more if you add uncore or all the offcore combinations), which is too
large to describe through the kernel interface. It would require tying up
significant amounts of unswappable memory for this.
Intel releases these JSON files in a standardized JSON format.
perf adds a parser that converts the JSON format into perf event
aliases, which then can be used directly as any other perf event.
The parsing is done using a simple existing JSON library.
The events are still abstracted for perf, but the abstraction mechanism is
through the file instead of through the kernel.
The JSON format and perf parser has some minor Intelisms, but they
are simple and small and optional. It's easy to extend, so it would be
possible to use it for other CPUs too, add different pmu attributes, and
add new download sites to the downloader tool. For example the format
can be used on POWER.
Currently only core events are supported, uncore may come at a later
point. No kernel changes, all code in perf user tools only.
Some of the parser files are partially shared with separate event parser
library and are thus 2-clause BSD licensed.
Patches also available from
git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-misc perf/json
Example output:
<Put JSON file for CPU in .cache/pmu-events/Vendor-Family-Model-core.json,
for example GenuineIntel-6-3E-core.json>
% perf list
...
br_inst_exec.all_branches [Speculative and retired
branches]
br_inst_exec.all_conditional [Speculative and retired
macro-conditional
branches]
br_inst_exec.all_direct_jmp [Speculative and retired
macro-unconditional
branches excluding
calls and indirects]
... 333 more new events ...
% perf stat -e br_inst_exec.all_direct_jmp true
Performance counter stats for 'true':
6,817 cpu/br_inst_exec.all_direct_jmp/
0.003503212 seconds time elapsed
One nice feature is that a pointer to the specification update is now
included in the description, which will hopefully clear up many problems:
% perf list
...
mem_load_uops_l3_hit_retired.xsnp_hit [Retired load uops which
data sources were L3
and cross-core snoop
hits in on-pkg core
cache. Supports address
when precise. Spec
update: HSM26, HSM30
(Precise event)]
...
-Andi
^ permalink raw reply [flat|nested] 23+ messages in thread* [PATCH 01/10] perf, tools: Add jsmn `jasmine' JSON parser 2014-07-30 23:22 perf: Add support for full Intel event lists v8 Andi Kleen @ 2014-07-30 23:22 ` Andi Kleen 2014-07-30 23:22 ` [PATCH 02/10] perf, tools: Add support for text descriptions of events and alias add Andi Kleen ` (9 subsequent siblings) 10 siblings, 0 replies; 23+ messages in thread From: Andi Kleen @ 2014-07-30 23:22 UTC (permalink / raw) To: jolsa; +Cc: linux-kernel, namhyung, acme, mingo, peterz, Andi Kleen From: Andi Kleen <ak@linux.intel.com> I need a JSON parser. This adds the simplest JSON parser I could find -- Serge Zaitsev's jsmn `jasmine' -- to the perf library. I merely converted it to (mostly) Linux style and added support for non 0 terminated input. The parser is quite straight forward and does not copy any data, just returns tokens with offsets into the input buffer. So it's relatively efficient and simple to use. The code is not fully checkpatch clean, but I didn't want to completely fork the upstream code. Original source: http://zserge.bitbucket.org/jsmn.html In addition I added a simple wrapper that mmaps a json file and provides some straight forward access functions. Used in follow-on patches to parse event files. v2: Address review feedback. v3: Minor checkpatch fixes. Acked-by: Namhyung Kim <namhyung@kernel.org> Signed-off-by: Andi Kleen <ak@linux.intel.com> --- tools/perf/Makefile.perf | 4 + tools/perf/util/jsmn.c | 313 +++++++++++++++++++++++++++++++++++++++++++++++ tools/perf/util/jsmn.h | 67 ++++++++++ tools/perf/util/json.c | 155 +++++++++++++++++++++++ tools/perf/util/json.h | 13 ++ 5 files changed, 552 insertions(+) create mode 100644 tools/perf/util/jsmn.c create mode 100644 tools/perf/util/jsmn.h create mode 100644 tools/perf/util/json.c create mode 100644 tools/perf/util/json.h diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index 2240974..074b826 100644 --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf @@ -302,6 +302,8 @@ LIB_H += ui/util.h LIB_H += ui/ui.h LIB_H += util/data.h LIB_H += util/kvm-stat.h +LIB_H += util/jsmn.h +LIB_H += util/json.h LIB_OBJS += $(OUTPUT)util/abspath.o LIB_OBJS += $(OUTPUT)util/alias.o @@ -377,6 +379,8 @@ LIB_OBJS += $(OUTPUT)util/srcline.o LIB_OBJS += $(OUTPUT)util/data.o LIB_OBJS += $(OUTPUT)util/tsc.o LIB_OBJS += $(OUTPUT)util/cloexec.o +LIB_OBJS += $(OUTPUT)util/jsmn.o +LIB_OBJS += $(OUTPUT)util/json.o LIB_OBJS += $(OUTPUT)ui/setup.o LIB_OBJS += $(OUTPUT)ui/helpline.o diff --git a/tools/perf/util/jsmn.c b/tools/perf/util/jsmn.c new file mode 100644 index 0000000..11d1fa1 --- /dev/null +++ b/tools/perf/util/jsmn.c @@ -0,0 +1,313 @@ +/* + * Copyright (c) 2010 Serge A. Zaitsev + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + * + * Slightly modified by AK to not assume 0 terminated input. + */ + +#include <stdlib.h> +#include "jsmn.h" + +/* + * Allocates a fresh unused token from the token pool. + */ +static jsmntok_t *jsmn_alloc_token(jsmn_parser *parser, + jsmntok_t *tokens, size_t num_tokens) +{ + jsmntok_t *tok; + + if ((unsigned)parser->toknext >= num_tokens) + return NULL; + tok = &tokens[parser->toknext++]; + tok->start = tok->end = -1; + tok->size = 0; + return tok; +} + +/* + * Fills token type and boundaries. + */ +static void jsmn_fill_token(jsmntok_t *token, jsmntype_t type, + int start, int end) +{ + token->type = type; + token->start = start; + token->end = end; + token->size = 0; +} + +/* + * Fills next available token with JSON primitive. + */ +static jsmnerr_t jsmn_parse_primitive(jsmn_parser *parser, const char *js, + size_t len, + jsmntok_t *tokens, size_t num_tokens) +{ + jsmntok_t *token; + int start; + + start = parser->pos; + + for (; parser->pos < len; parser->pos++) { + switch (js[parser->pos]) { +#ifndef JSMN_STRICT + /* + * In strict mode primitive must be followed by "," + * or "}" or "]" + */ + case ':': +#endif + case '\t': + case '\r': + case '\n': + case ' ': + case ',': + case ']': + case '}': + goto found; + default: + break; + } + if (js[parser->pos] < 32 || js[parser->pos] >= 127) { + parser->pos = start; + return JSMN_ERROR_INVAL; + } + } +#ifdef JSMN_STRICT + /* + * In strict mode primitive must be followed by a + * comma/object/array. + */ + parser->pos = start; + return JSMN_ERROR_PART; +#endif + +found: + token = jsmn_alloc_token(parser, tokens, num_tokens); + if (token == NULL) { + parser->pos = start; + return JSMN_ERROR_NOMEM; + } + jsmn_fill_token(token, JSMN_PRIMITIVE, start, parser->pos); + parser->pos--; /* parent sees closing brackets */ + return JSMN_SUCCESS; +} + +/* + * Fills next token with JSON string. + */ +static jsmnerr_t jsmn_parse_string(jsmn_parser *parser, const char *js, + size_t len, + jsmntok_t *tokens, size_t num_tokens) +{ + jsmntok_t *token; + int start = parser->pos; + + /* Skip starting quote */ + parser->pos++; + + for (; parser->pos < len; parser->pos++) { + char c = js[parser->pos]; + + /* Quote: end of string */ + if (c == '\"') { + token = jsmn_alloc_token(parser, tokens, num_tokens); + if (token == NULL) { + parser->pos = start; + return JSMN_ERROR_NOMEM; + } + jsmn_fill_token(token, JSMN_STRING, start+1, + parser->pos); + return JSMN_SUCCESS; + } + + /* Backslash: Quoted symbol expected */ + if (c == '\\') { + parser->pos++; + switch (js[parser->pos]) { + /* Allowed escaped symbols */ + case '\"': + case '/': + case '\\': + case 'b': + case 'f': + case 'r': + case 'n': + case 't': + break; + /* Allows escaped symbol \uXXXX */ + case 'u': + /* TODO */ + break; + /* Unexpected symbol */ + default: + parser->pos = start; + return JSMN_ERROR_INVAL; + } + } + } + parser->pos = start; + return JSMN_ERROR_PART; +} + +/* + * Parse JSON string and fill tokens. + */ +jsmnerr_t jsmn_parse(jsmn_parser *parser, const char *js, size_t len, + jsmntok_t *tokens, unsigned int num_tokens) +{ + jsmnerr_t r; + int i; + jsmntok_t *token; + + for (; parser->pos < len; parser->pos++) { + char c; + jsmntype_t type; + + c = js[parser->pos]; + switch (c) { + case '{': + case '[': + token = jsmn_alloc_token(parser, tokens, num_tokens); + if (token == NULL) + return JSMN_ERROR_NOMEM; + if (parser->toksuper != -1) + tokens[parser->toksuper].size++; + token->type = (c == '{' ? JSMN_OBJECT : JSMN_ARRAY); + token->start = parser->pos; + parser->toksuper = parser->toknext - 1; + break; + case '}': + case ']': + type = (c == '}' ? JSMN_OBJECT : JSMN_ARRAY); + for (i = parser->toknext - 1; i >= 0; i--) { + token = &tokens[i]; + if (token->start != -1 && token->end == -1) { + if (token->type != type) + return JSMN_ERROR_INVAL; + parser->toksuper = -1; + token->end = parser->pos + 1; + break; + } + } + /* Error if unmatched closing bracket */ + if (i == -1) + return JSMN_ERROR_INVAL; + for (; i >= 0; i--) { + token = &tokens[i]; + if (token->start != -1 && token->end == -1) { + parser->toksuper = i; + break; + } + } + break; + case '\"': + r = jsmn_parse_string(parser, js, len, tokens, + num_tokens); + if (r < 0) + return r; + if (parser->toksuper != -1) + tokens[parser->toksuper].size++; + break; + case '\t': + case '\r': + case '\n': + case ':': + case ',': + case ' ': + break; +#ifdef JSMN_STRICT + /* + * In strict mode primitives are: + * numbers and booleans. + */ + case '-': + case '0': + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': + case '8': + case '9': + case 't': + case 'f': + case 'n': +#else + /* + * In non-strict mode every unquoted value + * is a primitive. + */ + /*FALL THROUGH */ + default: +#endif + r = jsmn_parse_primitive(parser, js, len, tokens, + num_tokens); + if (r < 0) + return r; + if (parser->toksuper != -1) + tokens[parser->toksuper].size++; + break; + +#ifdef JSMN_STRICT + /* Unexpected char in strict mode */ + default: + return JSMN_ERROR_INVAL; +#endif + } + } + + for (i = parser->toknext - 1; i >= 0; i--) { + /* Unmatched opened object or array */ + if (tokens[i].start != -1 && tokens[i].end == -1) + return JSMN_ERROR_PART; + } + + return JSMN_SUCCESS; +} + +/* + * Creates a new parser based over a given buffer with an array of tokens + * available. + */ +void jsmn_init(jsmn_parser *parser) +{ + parser->pos = 0; + parser->toknext = 0; + parser->toksuper = -1; +} + +const char *jsmn_strerror(jsmnerr_t err) +{ + switch (err) { + case JSMN_ERROR_NOMEM: + return "No enough tokens"; + case JSMN_ERROR_INVAL: + return "Invalid character inside JSON string"; + case JSMN_ERROR_PART: + return "The string is not a full JSON packet, more bytes expected"; + case JSMN_SUCCESS: + return "Success"; + default: + return "Unknown json error"; + } +} diff --git a/tools/perf/util/jsmn.h b/tools/perf/util/jsmn.h new file mode 100644 index 0000000..d666b10 --- /dev/null +++ b/tools/perf/util/jsmn.h @@ -0,0 +1,67 @@ +#ifndef __JSMN_H_ +#define __JSMN_H_ + +/* + * JSON type identifier. Basic types are: + * o Object + * o Array + * o String + * o Other primitive: number, boolean (true/false) or null + */ +typedef enum { + JSMN_PRIMITIVE = 0, + JSMN_OBJECT = 1, + JSMN_ARRAY = 2, + JSMN_STRING = 3 +} jsmntype_t; + +typedef enum { + /* Not enough tokens were provided */ + JSMN_ERROR_NOMEM = -1, + /* Invalid character inside JSON string */ + JSMN_ERROR_INVAL = -2, + /* The string is not a full JSON packet, more bytes expected */ + JSMN_ERROR_PART = -3, + /* Everything was fine */ + JSMN_SUCCESS = 0 +} jsmnerr_t; + +/* + * JSON token description. + * @param type type (object, array, string etc.) + * @param start start position in JSON data string + * @param end end position in JSON data string + */ +typedef struct { + jsmntype_t type; + int start; + int end; + int size; +} jsmntok_t; + +/* + * JSON parser. Contains an array of token blocks available. Also stores + * the string being parsed now and current position in that string + */ +typedef struct { + unsigned int pos; /* offset in the JSON string */ + int toknext; /* next token to allocate */ + int toksuper; /* superior token node, e.g parent object or array */ +} jsmn_parser; + +/* + * Create JSON parser over an array of tokens + */ +void jsmn_init(jsmn_parser *parser); + +/* + * Run JSON parser. It parses a JSON data string into and array of tokens, + * each describing a single JSON object. + */ +jsmnerr_t jsmn_parse(jsmn_parser *parser, const char *js, + size_t len, + jsmntok_t *tokens, unsigned int num_tokens); + +const char *jsmn_strerror(jsmnerr_t err); + +#endif /* __JSMN_H_ */ diff --git a/tools/perf/util/json.c b/tools/perf/util/json.c new file mode 100644 index 0000000..cac1b83 --- /dev/null +++ b/tools/perf/util/json.c @@ -0,0 +1,155 @@ +/* Parse JSON files using the JSMN parser. */ + +/* + * Copyright (c) 2014, Intel Corporation + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, + * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. +*/ + +#include <stdlib.h> +#include <string.h> +#include <sys/mman.h> +#include <sys/stat.h> +#include <sys/fcntl.h> +#include <stdio.h> +#include <unistd.h> +#include "jsmn.h" +#include "json.h" +#include <linux/kernel.h> + +static char *mapfile(const char *fn, size_t *size) +{ + unsigned ps = sysconf(_SC_PAGESIZE); + struct stat st; + char *map = NULL; + int err; + int fd = open(fn, O_RDONLY); + + if (fd < 0) + return NULL; + err = fstat(fd, &st); + if (err < 0) + goto out; + *size = st.st_size; + map = mmap(NULL, + (st.st_size + ps - 1) & ~(ps - 1), + PROT_READ|PROT_WRITE, MAP_PRIVATE, fd, 0); + if (map == MAP_FAILED) + map = NULL; +out: + close(fd); + return map; +} + +static void unmapfile(char *map, size_t size) +{ + unsigned ps = sysconf(_SC_PAGESIZE); + munmap(map, roundup(size, ps)); +} + +/* + * Parse json file using jsmn. Return array of tokens, + * and mapped file. Caller needs to free array. + */ +jsmntok_t *parse_json(const char *fn, char **map, size_t *size, int *len) +{ + jsmn_parser parser; + jsmntok_t *tokens; + jsmnerr_t res; + unsigned sz; + + *map = mapfile(fn, size); + if (!*map) + return NULL; + /* Heuristic */ + sz = *size * 16; + tokens = malloc(sz); + if (!tokens) + goto error; + jsmn_init(&parser); + res = jsmn_parse(&parser, *map, *size, tokens, + sz / sizeof(jsmntok_t)); + if (res != JSMN_SUCCESS) { + pr_err("%s: json error %s\n", fn, jsmn_strerror(res)); + goto error_free; + } + if (len) + *len = parser.toknext; + return tokens; +error_free: + free(tokens); +error: + unmapfile(*map, *size); + return NULL; +} + +void free_json(char *map, size_t size, jsmntok_t *tokens) +{ + free(tokens); + unmapfile(map, size); +} + +static int countchar(char *map, char c, int end) +{ + int i; + int count = 0; + for (i = 0; i < end; i++) + if (map[i] == c) + count++; + return count; +} + +/* Return line number of a jsmn token */ +int json_line(char *map, jsmntok_t *t) +{ + return countchar(map, '\n', t->start) + 1; +} + +static const char * const jsmn_types[] = { + [JSMN_PRIMITIVE] = "primitive", + [JSMN_ARRAY] = "array", + [JSMN_OBJECT] = "object", + [JSMN_STRING] = "string" +}; + +#define LOOKUP(a, i) ((i) < (sizeof(a)/sizeof(*(a))) ? ((a)[i]) : "?") + +/* Return type name of a jsmn token */ +const char *json_name(jsmntok_t *t) +{ + return LOOKUP(jsmn_types, t->type); +} + +int json_len(jsmntok_t *t) +{ + return t->end - t->start; +} + +/* Is string t equal to s? */ +int json_streq(char *map, jsmntok_t *t, const char *s) +{ + unsigned len = json_len(t); + return len == strlen(s) && !strncasecmp(map + t->start, s, len); +} diff --git a/tools/perf/util/json.h b/tools/perf/util/json.h new file mode 100644 index 0000000..37dd9e9 --- /dev/null +++ b/tools/perf/util/json.h @@ -0,0 +1,13 @@ +#ifndef JSON_H +#define JSON_H 1 + +#include "jsmn.h" + +jsmntok_t *parse_json(const char *fn, char **map, size_t *size, int *len); +void free_json(char *map, size_t size, jsmntok_t *tokens); +int json_line(char *map, jsmntok_t *t); +const char *json_name(jsmntok_t *t); +int json_streq(char *map, jsmntok_t *t, const char *s); +int json_len(jsmntok_t *t); + +#endif -- 1.9.3 ^ permalink raw reply related [flat|nested] 23+ messages in thread
* [PATCH 02/10] perf, tools: Add support for text descriptions of events and alias add 2014-07-30 23:22 perf: Add support for full Intel event lists v8 Andi Kleen 2014-07-30 23:22 ` [PATCH 01/10] perf, tools: Add jsmn `jasmine' JSON parser Andi Kleen @ 2014-07-30 23:22 ` Andi Kleen 2014-07-30 23:22 ` [PATCH 03/10] perf, tools, list: Update perf list to output descriptions Andi Kleen ` (8 subsequent siblings) 10 siblings, 0 replies; 23+ messages in thread From: Andi Kleen @ 2014-07-30 23:22 UTC (permalink / raw) To: jolsa; +Cc: linux-kernel, namhyung, acme, mingo, peterz, Andi Kleen From: Andi Kleen <ak@linux.intel.com> Change pmu.c to allow descriptions of events and add interfaces to add aliases at runtime from another file. To be used by jevents in a followon patch Acked-by: Namhyung Kim <namhyung@kernel.org> v2: Move perf list changes to other patch. Signed-off-by: Andi Kleen <ak@linux.intel.com> --- tools/perf/util/pmu.c | 43 ++++++++++++++++++++++++++++++------------- 1 file changed, 30 insertions(+), 13 deletions(-) diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c index 7a811eb..f9c7046 100644 --- a/tools/perf/util/pmu.c +++ b/tools/perf/util/pmu.c @@ -14,6 +14,7 @@ struct perf_pmu_alias { char *name; + char *desc; struct list_head terms; struct list_head list; char unit[UNIT_MAX_LEN+1]; @@ -171,17 +172,12 @@ error: return -1; } -static int perf_pmu__new_alias(struct list_head *list, char *dir, char *name, FILE *file) +static int __perf_pmu__new_alias(struct list_head *list, char *name, + char *dir, char *desc, char *val) { struct perf_pmu_alias *alias; - char buf[256]; int ret; - ret = fread(buf, 1, sizeof(buf), file); - if (ret == 0) - return -EINVAL; - buf[ret] = 0; - alias = malloc(sizeof(*alias)); if (!alias) return -ENOMEM; @@ -190,24 +186,45 @@ static int perf_pmu__new_alias(struct list_head *list, char *dir, char *name, FI alias->scale = 1.0; alias->unit[0] = '\0'; - ret = parse_events_terms(&alias->terms, buf); + ret = parse_events_terms(&alias->terms, val); if (ret) { + pr_err("Cannot parse alias %s: %d\n", val, ret); free(alias); return ret; } alias->name = strdup(name); - /* - * load unit name and scale if available - */ - perf_pmu__parse_unit(alias, dir, name); - perf_pmu__parse_scale(alias, dir, name); + if (dir) { + /* + * load unit name and scale if available + */ + perf_pmu__parse_unit(alias, dir, name); + perf_pmu__parse_scale(alias, dir, name); + } + + alias->desc = desc ? strdup(desc) : NULL; list_add_tail(&alias->list, list); return 0; } +static int perf_pmu__new_alias(struct list_head *list, + char *dir, + char *name, + FILE *file) +{ + char buf[256]; + int ret; + + ret = fread(buf, 1, sizeof(buf), file); + if (ret == 0) + return -EINVAL; + buf[ret] = 0; + + return __perf_pmu__new_alias(list, name, dir, NULL, buf); +} + /* * Process all the sysfs attributes located under the directory * specified in 'dir' parameter. -- 1.9.3 ^ permalink raw reply related [flat|nested] 23+ messages in thread
* [PATCH 03/10] perf, tools, list: Update perf list to output descriptions 2014-07-30 23:22 perf: Add support for full Intel event lists v8 Andi Kleen 2014-07-30 23:22 ` [PATCH 01/10] perf, tools: Add jsmn `jasmine' JSON parser Andi Kleen 2014-07-30 23:22 ` [PATCH 02/10] perf, tools: Add support for text descriptions of events and alias add Andi Kleen @ 2014-07-30 23:22 ` Andi Kleen 2014-07-30 23:22 ` [PATCH 04/10] perf, tools: Allow events with dot Andi Kleen ` (7 subsequent siblings) 10 siblings, 0 replies; 23+ messages in thread From: Andi Kleen @ 2014-07-30 23:22 UTC (permalink / raw) To: jolsa; +Cc: linux-kernel, namhyung, acme, mingo, peterz, Andi Kleen From: Andi Kleen <ak@linux.intel.com> Add support to perf list to print aliases with descriptions. Support word wrapping for descriptions. Fix up the sorting code to put aliases with descriptions last. Signed-off-by: Andi Kleen <ak@linux.intel.com> --- tools/perf/util/pmu.c | 84 +++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 68 insertions(+), 16 deletions(-) diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c index f9c7046..baec090 100644 --- a/tools/perf/util/pmu.c +++ b/tools/perf/util/pmu.c @@ -737,11 +737,51 @@ static char *format_alias_or(char *buf, int len, struct perf_pmu *pmu, return buf; } -static int cmp_string(const void *a, const void *b) +struct pair { + char *name; + char *desc; +}; + +static int cmp_pair(const void *a, const void *b) +{ + const struct pair *as = a; + const struct pair *bs = b; + + /* Put downloaded event list last */ + if (!!as->desc != !!bs->desc) + return !!as->desc - !!bs->desc; + return strcmp(as->name, bs->name); +} + +static void wordwrap(char *s, int start, int max, int corr) +{ + int column = start; + int n; + + while (*s) { + int wlen = strcspn(s, " \t"); + + if (column + wlen >= max && column > start) { + printf("\n%*s", start, ""); + column = start + corr; + } + n = printf("%s%.*s", column > start ? " " : "", wlen, s); + if (n <= 0) + break; + s += wlen; + column += n; + while (isspace(*s)) + s++; + } +} + +static int get_columns(void) { - const char * const *as = a; - const char * const *bs = b; - return strcmp(*as, *bs); + /* + * Should ask the terminal with TIOCGWINSZ here, but we + * need the original fd before the pager. + */ + return 79; } void print_pmu_events(const char *event_glob, bool name_only) @@ -751,21 +791,24 @@ void print_pmu_events(const char *event_glob, bool name_only) char buf[1024]; int printed = 0; int len, j; - char **aliases; + struct pair *aliases; + int numdesc = 0; + int columns = get_columns(); pmu = NULL; len = 0; while ((pmu = perf_pmu__scan(pmu)) != NULL) list_for_each_entry(alias, &pmu->aliases, list) len++; - aliases = malloc(sizeof(char *) * len); + aliases = malloc(sizeof(struct pair) * len); if (!aliases) return; pmu = NULL; j = 0; while ((pmu = perf_pmu__scan(pmu)) != NULL) list_for_each_entry(alias, &pmu->aliases, list) { - char *name = format_alias(buf, sizeof(buf), pmu, alias); + char *name = alias->desc ? alias->name : + format_alias(buf, sizeof(buf), pmu, alias); bool is_cpu = !strcmp(pmu->name, "cpu"); if (event_glob != NULL && @@ -773,22 +816,31 @@ void print_pmu_events(const char *event_glob, bool name_only) (!is_cpu && strglobmatch(alias->name, event_glob)))) continue; - aliases[j] = name; - if (is_cpu && !name_only) - aliases[j] = format_alias_or(buf, sizeof(buf), - pmu, alias); - aliases[j] = strdup(aliases[j]); + aliases[j].name = name; + if (is_cpu && !name_only && !alias->desc) + aliases[j].name = format_alias_or(buf, + sizeof(buf), + pmu, alias); + aliases[j].name = strdup(aliases[j].name); + aliases[j].desc = alias->desc; j++; } len = j; - qsort(aliases, len, sizeof(char *), cmp_string); + qsort(aliases, len, sizeof(struct pair), cmp_pair); for (j = 0; j < len; j++) { if (name_only) { - printf("%s ", aliases[j]); + printf("%s ", aliases[j].name); continue; } - printf(" %-50s [Kernel PMU event]\n", aliases[j]); - zfree(&aliases[j]); + if (aliases[j].desc) { + if (numdesc++ == 0 && printed) + printf("\n"); + printf(" %-50s [", aliases[j].name); + wordwrap(aliases[j].desc, 53, columns, 1); + printf("]\n"); + } else + printf(" %-50s [Kernel PMU event]\n", aliases[j].name); + zfree(&aliases[j].name); printed++; } if (printed) -- 1.9.3 ^ permalink raw reply related [flat|nested] 23+ messages in thread
* [PATCH 04/10] perf, tools: Allow events with dot 2014-07-30 23:22 perf: Add support for full Intel event lists v8 Andi Kleen ` (2 preceding siblings ...) 2014-07-30 23:22 ` [PATCH 03/10] perf, tools, list: Update perf list to output descriptions Andi Kleen @ 2014-07-30 23:22 ` Andi Kleen 2014-07-30 23:22 ` [PATCH 05/10] perf, tools: Add support for reading JSON event files Andi Kleen ` (6 subsequent siblings) 10 siblings, 0 replies; 23+ messages in thread From: Andi Kleen @ 2014-07-30 23:22 UTC (permalink / raw) To: jolsa; +Cc: linux-kernel, namhyung, acme, mingo, peterz, Andi Kleen From: Andi Kleen <ak@linux.intel.com> The Intel events use a dot to separate event name and unit mask. Allow dot in names in the scanner, and remove special handling of dot as EOF. Also remove the hack in jevents to replace dot with underscore. This way dotted events can be specified directly by the user. I'm not fully sure this change to the scanner is correct (what was the dot special case good for?), but I haven't found anything that breaks with it so far at least. Acked-by: Namhyung Kim <namhyung@kernel.org> Signed-off-by: Andi Kleen <ak@linux.intel.com> --- tools/perf/util/parse-events.l | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tools/perf/util/parse-events.l b/tools/perf/util/parse-events.l index 3432995..709fa3b 100644 --- a/tools/perf/util/parse-events.l +++ b/tools/perf/util/parse-events.l @@ -81,7 +81,7 @@ num_dec [0-9]+ num_hex 0x[a-fA-F0-9]+ num_raw_hex [a-fA-F0-9]+ name [a-zA-Z_*?][a-zA-Z0-9_*?]* -name_minus [a-zA-Z_*?][a-zA-Z0-9\-_*?]* +name_minus [a-zA-Z_*?][a-zA-Z0-9\-_*?.]* /* If you add a modifier you need to update check_modifier() */ modifier_event [ukhpGHSD]+ modifier_bp [rwx]{1,3} @@ -119,7 +119,6 @@ modifier_bp [rwx]{1,3} return PE_EVENT_NAME; } -. | <<EOF>> { BEGIN(INITIAL); yyless(0); } -- 1.9.3 ^ permalink raw reply related [flat|nested] 23+ messages in thread
* [PATCH 05/10] perf, tools: Add support for reading JSON event files 2014-07-30 23:22 perf: Add support for full Intel event lists v8 Andi Kleen ` (3 preceding siblings ...) 2014-07-30 23:22 ` [PATCH 04/10] perf, tools: Allow events with dot Andi Kleen @ 2014-07-30 23:22 ` Andi Kleen 2014-07-30 23:22 ` [PATCH 06/10] perf, tools: Automatically look for event file name for cpu Andi Kleen ` (5 subsequent siblings) 10 siblings, 0 replies; 23+ messages in thread From: Andi Kleen @ 2014-07-30 23:22 UTC (permalink / raw) To: jolsa; +Cc: linux-kernel, namhyung, acme, mingo, peterz, Andi Kleen From: Andi Kleen <ak@linux.intel.com> Add a parser for Intel style JSON event files. This allows to use an Intel event list directly with perf. The Intel event lists can be quite large and are too big to store in unswappable kernel memory. The parser code knows how to convert the JSON fields to perf fields. The conversion code is straight forward. It knows (very little) Intel specific information, and can be easily extended to handle fields for other CPUs. The parser code is partially shared with an independent parsing library, which is 2-clause BSD licenced. To avoid any conflicts I marked those files as BSD licenced too. As part of perf they become GPLv2. The events are handled using the existing alias machinery. We output the BriefDescription in perf list. Right now the json file can be specified as an argument to perf stat/record/list. Followon patches will automate this. JSON files look like this: [ { "EventCode": "0x00", "UMask": "0x01", "EventName": "INST_RETIRED.ANY", "BriefDescription": "Instructions retired from execution.", "PublicDescription": "Instructions retired from execution.", "Counter": "Fixed counter 1", "CounterHTOff": "Fixed counter 1", "SampleAfterValue": "2000003", "MSRIndex": "0", "MSRValue": "0", "TakenAlone": "0", "CounterMask": "0", "Invert": "0", "AnyThread": "0", "EdgeDetect": "0", "PEBS": "0", "PRECISE_STORE": "0", "Errata": "null", "Offcore": "0" } ] v2: Address review feedback. Rename option to --event-files v3: Add JSON example v4: Update manpages. v5: Don't remove dot in fixname. Fix compile error. Add include protection. Comment realloc. v6: Include debug/util.h Acked-by: Namhyung Kim <namhyung@kernel.org> Signed-off-by: Andi Kleen <ak@linux.intel.com> --- tools/perf/Documentation/perf-list.txt | 12 +- tools/perf/Documentation/perf-record.txt | 8 +- tools/perf/Documentation/perf-stat.txt | 8 +- tools/perf/Makefile.perf | 2 + tools/perf/builtin-list.c | 2 + tools/perf/builtin-record.c | 3 + tools/perf/builtin-stat.c | 2 + tools/perf/util/jevents.c | 247 +++++++++++++++++++++++++++++++ tools/perf/util/jevents.h | 8 + tools/perf/util/json.c | 1 + tools/perf/util/pmu.c | 14 ++ tools/perf/util/pmu.h | 2 + 12 files changed, 305 insertions(+), 4 deletions(-) create mode 100644 tools/perf/util/jevents.c create mode 100644 tools/perf/util/jevents.h diff --git a/tools/perf/Documentation/perf-list.txt b/tools/perf/Documentation/perf-list.txt index 6fce6a6..da03992 100644 --- a/tools/perf/Documentation/perf-list.txt +++ b/tools/perf/Documentation/perf-list.txt @@ -15,8 +15,16 @@ DESCRIPTION This command displays the symbolic event types which can be selected in the various perf commands with the -e option. -[[EVENT_MODIFIERS]] -EVENT MODIFIERS +OPTIONS +------- +--events-file=:: +Specify JSON event list file to use for parsing events. Files can be +automatically downloaded with perf download. +The JSON event file can be also specified with the EVENTMAP environment +variable. + + +[[EVENT_MODIFIERS]] EVENT MODIFIERS --------------- Events can optionally have a modifer by appending a colon and one or diff --git a/tools/perf/Documentation/perf-record.txt b/tools/perf/Documentation/perf-record.txt index d460049..62c27fc 100644 --- a/tools/perf/Documentation/perf-record.txt +++ b/tools/perf/Documentation/perf-record.txt @@ -214,6 +214,12 @@ if combined with -a or -C options. After starting the program, wait msecs before measuring. This is useful to filter out the startup phase of the program, which is often very different. +--events-file=:: +Specify JSON event list file to use for parsing events. Must be specified +before the -e option. Files can be automatically downloaded with perf download. +The JSON event file can be also specified with the EVENTMAP environment +variable. + SEE ALSO -------- -linkperf:perf-stat[1], linkperf:perf-list[1] +linkperf:perf-stat[1], linkperf:perf-list[1], linkperf:perf-download[1] diff --git a/tools/perf/Documentation/perf-stat.txt b/tools/perf/Documentation/perf-stat.txt index 29ee857..cd9b62f 100644 --- a/tools/perf/Documentation/perf-stat.txt +++ b/tools/perf/Documentation/perf-stat.txt @@ -142,6 +142,12 @@ filter out the startup phase of the program, which is often very different. Print statistics of transactional execution if supported. +--events-file=:: +Specify JSON event list file to use for parsing events. Must be specified before +the -e option. Files can be automatically downloaded with perf download. +The JSON event file can be also specified with the EVENTMAP environment +variable. + EXAMPLES -------- @@ -162,4 +168,4 @@ $ perf stat -- make -j SEE ALSO -------- -linkperf:perf-top[1], linkperf:perf-list[1] +linkperf:perf-top[1], linkperf:perf-list[1], linkperf:perf-download[1] diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index 074b826..f9cce8e 100644 --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf @@ -304,6 +304,7 @@ LIB_H += util/data.h LIB_H += util/kvm-stat.h LIB_H += util/jsmn.h LIB_H += util/json.h +LIB_H += util/jevents.h LIB_OBJS += $(OUTPUT)util/abspath.o LIB_OBJS += $(OUTPUT)util/alias.o @@ -381,6 +382,7 @@ LIB_OBJS += $(OUTPUT)util/tsc.o LIB_OBJS += $(OUTPUT)util/cloexec.o LIB_OBJS += $(OUTPUT)util/jsmn.o LIB_OBJS += $(OUTPUT)util/json.o +LIB_OBJS += $(OUTPUT)util/jevents.o LIB_OBJS += $(OUTPUT)ui/setup.o LIB_OBJS += $(OUTPUT)ui/helpline.o diff --git a/tools/perf/builtin-list.c b/tools/perf/builtin-list.c index 011195e..086c96f 100644 --- a/tools/perf/builtin-list.c +++ b/tools/perf/builtin-list.c @@ -20,6 +20,8 @@ int cmd_list(int argc, const char **argv, const char *prefix __maybe_unused) { int i; const struct option list_options[] = { + OPT_STRING(0, "events-file", &json_file, "json file", + "Read event json file"), OPT_END() }; const char * const list_usage[] = { diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c index 4869050..48570821 100644 --- a/tools/perf/builtin-record.c +++ b/tools/perf/builtin-record.c @@ -25,6 +25,7 @@ #include "util/cpumap.h" #include "util/thread_map.h" #include "util/data.h" +#include "util/pmu.h" #include <unistd.h> #include <sched.h> @@ -881,6 +882,8 @@ const struct option record_options[] = { "sample transaction flags (special events only)"), OPT_BOOLEAN(0, "per-thread", &record.opts.target.per_thread, "use per-thread mmaps"), + OPT_STRING(0, "events-file", &json_file, "json file", + "Read event json file"), OPT_END() }; diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c index 3e80aa1..37abdc2 100644 --- a/tools/perf/builtin-stat.c +++ b/tools/perf/builtin-stat.c @@ -1668,6 +1668,8 @@ int cmd_stat(int argc, const char **argv, const char *prefix __maybe_unused) "aggregate counts per physical processor core", AGGR_CORE), OPT_UINTEGER('D', "delay", &initial_delay, "ms to wait before starting measurement after program start"), + OPT_STRING(0, "events-file", &json_file, "json file", + "Read event json file"), OPT_END() }; const char * const stat_usage[] = { diff --git a/tools/perf/util/jevents.c b/tools/perf/util/jevents.c new file mode 100644 index 0000000..023757c --- /dev/null +++ b/tools/perf/util/jevents.c @@ -0,0 +1,247 @@ +/* Parse event JSON files */ + +/* + * Copyright (c) 2014, Intel Corporation + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, + * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. +*/ + +#include <stdio.h> +#include <stdlib.h> +#include <errno.h> +#include <string.h> +#include <ctype.h> +#include "util/debug.h" +#include "cache.h" +#include "jsmn.h" +#include "json.h" +#include "jevents.h" + +static void addfield(char *map, char **dst, const char *sep, + const char *a, jsmntok_t *bt) +{ + unsigned len = strlen(a) + 1 + strlen(sep); + int olen = *dst ? strlen(*dst) : 0; + int blen = bt ? json_len(bt) : 0; + char *out; + + out = realloc(*dst, len + olen + blen); + if (!out) { + /* Don't add field in this case */ + return; + } + *dst = out; + + if (!olen) + *(*dst) = 0; + else + strcat(*dst, sep); + strcat(*dst, a); + if (bt) + strncat(*dst, map + bt->start, blen); +} + +static void fixname(char *s) +{ + for (; *s; s++) + *s = tolower(*s); +} + +static void fixdesc(char *s) +{ + char *e = s + strlen(s); + + /* Remove trailing dots that look ugly in perf list */ + --e; + while (e >= s && isspace(*e)) + --e; + if (*e == '.') + *e = 0; +} + +static struct msrmap { + const char *num; + const char *pname; +} msrmap[] = { + { "0x3F6", "ldlat=" }, + { "0x1A6", "offcore_rsp=" }, + { "0x1A7", "offcore_rsp=" }, + { NULL, NULL } +}; + +static struct field { + const char *field; + const char *kernel; +} fields[] = { + { "EventCode", "event=" }, + { "UMask", "umask=" }, + { "CounterMask", "cmask=" }, + { "Invert", "inv=" }, + { "AnyThread", "any=" }, + { "EdgeDetect", "edge=" }, + { "SampleAfterValue", "period=" }, + { NULL, NULL } +}; + +static void cut_comma(char *map, jsmntok_t *newval) +{ + int i; + + /* Cut off everything after comma */ + for (i = newval->start; i < newval->end; i++) { + if (map[i] == ',') + newval->end = i; + } +} + +static int match_field(char *map, jsmntok_t *field, int nz, + char **event, jsmntok_t *val) +{ + struct field *f; + jsmntok_t newval = *val; + + for (f = fields; f->field; f++) + if (json_streq(map, field, f->field) && nz) { + cut_comma(map, &newval); + addfield(map, event, ",", f->kernel, &newval); + return 1; + } + return 0; +} + +static struct msrmap *lookup_msr(char *map, jsmntok_t *val) +{ + jsmntok_t newval = *val; + static bool warned; + int i; + + cut_comma(map, &newval); + for (i = 0; msrmap[i].num; i++) + if (json_streq(map, &newval, msrmap[i].num)) + return &msrmap[i]; + if (!warned) { + warned = true; + pr_err("Unknown MSR in event file %.*s\n", + json_len(val), map + val->start); + } + return NULL; +} + +#define EXPECT(e, t, m) do { if (!(e)) { \ + jsmntok_t *loc = (t); \ + if (!(t)->start && (t) > tokens) \ + loc = (t) - 1; \ + pr_err("%s:%d: " m ", got %s\n", fn, \ + json_line(map, loc), \ + json_name(t)); \ + goto out_free; \ +} } while (0) + +/* Call func with each event in the json file */ + +int json_events(const char *fn, + int (*func)(void *data, char *name, char *event, char *desc), + void *data) +{ + int err = -EIO; + size_t size; + jsmntok_t *tokens, *tok; + int i, j, len; + char *map; + + tokens = parse_json(fn, &map, &size, &len); + if (!tokens) + return -EIO; + EXPECT(tokens->type == JSMN_ARRAY, tokens, "expected top level array"); + tok = tokens + 1; + for (i = 0; i < tokens->size; i++) { + char *event = NULL, *desc = NULL, *name = NULL; + struct msrmap *msr = NULL; + jsmntok_t *msrval = NULL; + jsmntok_t *precise = NULL; + jsmntok_t *obj = tok++; + + EXPECT(obj->type == JSMN_OBJECT, obj, "expected object"); + for (j = 0; j < obj->size; j += 2) { + jsmntok_t *field, *val; + int nz; + + field = tok + j; + EXPECT(field->type == JSMN_STRING, tok + j, + "Expected field name"); + val = tok + j + 1; + EXPECT(val->type == JSMN_STRING, tok + j + 1, + "Expected string value"); + + nz = !json_streq(map, val, "0"); + if (match_field(map, field, nz, &event, val)) { + /* ok */ + } else if (json_streq(map, field, "EventName")) { + addfield(map, &name, "", "", val); + } else if (json_streq(map, field, "BriefDescription")) { + addfield(map, &desc, "", "", val); + fixdesc(desc); + } else if (json_streq(map, field, "PEBS") && nz) { + precise = val; + } else if (json_streq(map, field, "MSRIndex") && nz) { + msr = lookup_msr(map, val); + } else if (json_streq(map, field, "MSRValue")) { + msrval = val; + } else if (json_streq(map, field, "Errata") && + !json_streq(map, val, "null")) { + addfield(map, &desc, ". ", + " Spec update: ", val); + } else if (json_streq(map, field, "Data_LA") && nz) { + addfield(map, &desc, ". ", + " Supports address when precise", + NULL); + } + /* ignore unknown fields */ + } + if (precise && !strstr(desc, "(Precise Event)")) { + if (json_streq(map, precise, "2")) + addfield(map, &desc, " ", "(Must be precise)", + NULL); + else + addfield(map, &desc, " ", + "(Precise event)", NULL); + } + if (msr != NULL) + addfield(map, &event, ",", msr->pname, msrval); + fixname(name); + err = func(data, name, event, desc); + free(event); + free(desc); + free(name); + if (err) + break; + tok += j; + } + EXPECT(tok - tokens == len, tok, "unexpected objects at end"); + err = 0; +out_free: + free_json(map, size, tokens); + return err; +} diff --git a/tools/perf/util/jevents.h b/tools/perf/util/jevents.h new file mode 100644 index 0000000..fbc4549 --- /dev/null +++ b/tools/perf/util/jevents.h @@ -0,0 +1,8 @@ +#ifndef JEVENTS_H +#define JEVENTS_H 1 + +int json_events(const char *fn, + int (*func)(void *data, char *name, char *event, char *desc), + void *data); + +#endif diff --git a/tools/perf/util/json.c b/tools/perf/util/json.c index cac1b83..82981d2 100644 --- a/tools/perf/util/json.c +++ b/tools/perf/util/json.c @@ -37,6 +37,7 @@ #include <unistd.h> #include "jsmn.h" #include "json.h" +#include "util/debug.h" #include <linux/kernel.h> static char *mapfile(const char *fn, size_t *size) diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c index baec090..9f154af 100644 --- a/tools/perf/util/pmu.c +++ b/tools/perf/util/pmu.c @@ -9,6 +9,9 @@ #include "pmu.h" #include "parse-events.h" #include "cpumap.h" +#include "jevents.h" + +const char *json_file; #define UNIT_MAX_LEN 31 /* max length for event unit name */ @@ -273,6 +276,14 @@ static int pmu_aliases_parse(char *dir, struct list_head *head) return ret; } +static int add_alias(void *data, char *name, char *event, char *desc) +{ + struct list_head *head = (struct list_head *)data; + + __perf_pmu__new_alias(head, name, NULL, desc, event); + return 0; +} + /* * Reading the pmu event aliases definition, which should be located at: * /sys/bus/event_source/devices/<dev>/events as sysfs group attributes. @@ -422,6 +433,9 @@ static struct perf_pmu *pmu_lookup(const char *name) if (pmu_aliases(name, &aliases)) return NULL; + if (!strcmp(name, "cpu") && json_file) + json_events(json_file, add_alias, &aliases); + if (pmu_type(name, &type)) return NULL; diff --git a/tools/perf/util/pmu.h b/tools/perf/util/pmu.h index c14a543..583d21e 100644 --- a/tools/perf/util/pmu.h +++ b/tools/perf/util/pmu.h @@ -46,4 +46,6 @@ void print_pmu_events(const char *event_glob, bool name_only); bool pmu_have_event(const char *pname, const char *name); int perf_pmu__test(void); + +extern const char *json_file; #endif /* __PMU_H */ -- 1.9.3 ^ permalink raw reply related [flat|nested] 23+ messages in thread
* [PATCH 06/10] perf, tools: Automatically look for event file name for cpu 2014-07-30 23:22 perf: Add support for full Intel event lists v8 Andi Kleen ` (4 preceding siblings ...) 2014-07-30 23:22 ` [PATCH 05/10] perf, tools: Add support for reading JSON event files Andi Kleen @ 2014-07-30 23:22 ` Andi Kleen 2014-07-30 23:22 ` [PATCH 07/10] perf, tools: Query terminal width and use in perf list Andi Kleen ` (4 subsequent siblings) 10 siblings, 0 replies; 23+ messages in thread From: Andi Kleen @ 2014-07-30 23:22 UTC (permalink / raw) To: jolsa; +Cc: linux-kernel, namhyung, acme, mingo, peterz, Andi Kleen From: Andi Kleen <ak@linux.intel.com> When no JSON event file is specified automatically look for a suitable file in ~/.cache/pmu-events. The event file format is per architecture, but can be extended for other architectures. v2: Supports XDG_CACHE_HOME and defaults to ~/.cache/pmu-events v3: Minor updates and handle EVENTMAP. v4: Unify with header.c. Now uses CPUID directly. Acked-by: Namhyung Kim <namhyung@kernel.org> Signed-off-by: Andi Kleen <ak@linux.intel.com> --- tools/perf/arch/x86/util/header.c | 19 ++++++++++++++++--- tools/perf/util/jevents.c | 40 +++++++++++++++++++++++++++++++++++++++ tools/perf/util/jevents.h | 1 + tools/perf/util/pmu.c | 2 +- 4 files changed, 58 insertions(+), 4 deletions(-) diff --git a/tools/perf/arch/x86/util/header.c b/tools/perf/arch/x86/util/header.c index 146d12a..76e0ece 100644 --- a/tools/perf/arch/x86/util/header.c +++ b/tools/perf/arch/x86/util/header.c @@ -5,6 +5,7 @@ #include <string.h> #include "../../util/header.h" +#include "../../util/jevents.h" static inline void cpuid(unsigned int op, unsigned int *a, unsigned int *b, unsigned int *c, @@ -19,8 +20,8 @@ cpuid(unsigned int op, unsigned int *a, unsigned int *b, unsigned int *c, : "a" (op)); } -int -get_cpuid(char *buffer, size_t sz) +static int +__get_cpuid(char *buffer, size_t sz, const char *fmt) { unsigned int a, b, c, d, lvl; int family = -1, model = -1, step = -1; @@ -48,7 +49,7 @@ get_cpuid(char *buffer, size_t sz) if (family >= 0x6) model += ((a >> 16) & 0xf) << 4; } - nb = scnprintf(buffer, sz, "%s,%u,%u,%u$", vendor, family, model, step); + nb = scnprintf(buffer, sz, fmt, vendor, family, model, step); /* look for end marker to ensure the entire data fit */ if (strchr(buffer, '$')) { @@ -57,3 +58,15 @@ get_cpuid(char *buffer, size_t sz) } return -1; } + +int get_cpuid(char *buffer, size_t sz) +{ + return __get_cpuid(buffer, sz, "%s,%u,%u,%u$"); +} + +char *get_cpu_str(void) +{ + char *buf = malloc(128); + __get_cpuid(buf, 128, "%s-%d-%X-core"); + return buf; +} diff --git a/tools/perf/util/jevents.c b/tools/perf/util/jevents.c index 023757c..ef4c047 100644 --- a/tools/perf/util/jevents.c +++ b/tools/perf/util/jevents.c @@ -39,6 +39,44 @@ #include "json.h" #include "jevents.h" +__attribute__((weak)) char *get_cpu_str(void) +{ + return NULL; +} + +static const char *json_default_name(void) +{ + char *cache; + char *idstr = get_cpu_str(); + char *res = NULL; + char *home = NULL; + char *emap; + + emap = getenv("EVENTMAP"); + if (emap) { + if (access(emap, R_OK) == 0) + return emap; + if (asprintf(&idstr, "%s-core", emap) < 0) + return NULL; + } + + cache = getenv("XDG_CACHE_HOME"); + if (!cache) { + home = getenv("HOME"); + if (!home || asprintf(&cache, "%s/.cache", home) < 0) + goto out; + } + if (cache && idstr) + res = mkpath("%s/pmu-events/%s.json", + cache, + idstr); + if (home) + free(cache); +out: + free(idstr); + return res; +} + static void addfield(char *map, char **dst, const char *sep, const char *a, jsmntok_t *bt) { @@ -171,6 +209,8 @@ int json_events(const char *fn, int i, j, len; char *map; + if (!fn) + fn = json_default_name(); tokens = parse_json(fn, &map, &size, &len); if (!tokens) return -EIO; diff --git a/tools/perf/util/jevents.h b/tools/perf/util/jevents.h index fbc4549..86a94dd 100644 --- a/tools/perf/util/jevents.h +++ b/tools/perf/util/jevents.h @@ -4,5 +4,6 @@ int json_events(const char *fn, int (*func)(void *data, char *name, char *event, char *desc), void *data); +char *get_cpu_str(void); #endif diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c index 9f154af..fa21319 100644 --- a/tools/perf/util/pmu.c +++ b/tools/perf/util/pmu.c @@ -433,7 +433,7 @@ static struct perf_pmu *pmu_lookup(const char *name) if (pmu_aliases(name, &aliases)) return NULL; - if (!strcmp(name, "cpu") && json_file) + if (!strcmp(name, "cpu")) json_events(json_file, add_alias, &aliases); if (pmu_type(name, &type)) -- 1.9.3 ^ permalink raw reply related [flat|nested] 23+ messages in thread
* [PATCH 07/10] perf, tools: Query terminal width and use in perf list 2014-07-30 23:22 perf: Add support for full Intel event lists v8 Andi Kleen ` (5 preceding siblings ...) 2014-07-30 23:22 ` [PATCH 06/10] perf, tools: Automatically look for event file name for cpu Andi Kleen @ 2014-07-30 23:22 ` Andi Kleen 2014-07-30 23:22 ` [PATCH 08/10] perf, tools: Add a new pmu interface to iterate over all events Andi Kleen ` (3 subsequent siblings) 10 siblings, 0 replies; 23+ messages in thread From: Andi Kleen @ 2014-07-30 23:22 UTC (permalink / raw) To: jolsa; +Cc: linux-kernel, namhyung, acme, mingo, peterz, Andi Kleen From: Andi Kleen <ak@linux.intel.com> Automatically adapt the now wider and word wrapped perf list output to wider terminals. This requires querying the terminal before the auto pager takes over, and exporting this information from the pager subsystem. Acked-by: Namhyung Kim <namhyung@kernel.org> Signed-off-by: Andi Kleen <ak@linux.intel.com> --- tools/perf/util/cache.h | 1 + tools/perf/util/pager.c | 15 +++++++++++++++ tools/perf/util/pmu.c | 12 ++---------- 3 files changed, 18 insertions(+), 10 deletions(-) diff --git a/tools/perf/util/cache.h b/tools/perf/util/cache.h index 7b176dd..07527d6 100644 --- a/tools/perf/util/cache.h +++ b/tools/perf/util/cache.h @@ -31,6 +31,7 @@ extern void setup_pager(void); extern const char *pager_program; extern int pager_in_use(void); extern int pager_use_color; +int pager_get_columns(void); char *alias_lookup(const char *alias); int split_cmdline(char *cmdline, const char ***argv); diff --git a/tools/perf/util/pager.c b/tools/perf/util/pager.c index 31ee02d..9761202 100644 --- a/tools/perf/util/pager.c +++ b/tools/perf/util/pager.c @@ -1,6 +1,7 @@ #include "cache.h" #include "run-command.h" #include "sigchain.h" +#include <sys/ioctl.h> /* * This is split up from the rest of git so that we can do @@ -8,6 +9,7 @@ */ static int spawned_pager; +static int pager_columns; static void pager_preexec(void) { @@ -47,9 +49,12 @@ static void wait_for_pager_signal(int signo) void setup_pager(void) { const char *pager = getenv("PERF_PAGER"); + struct winsize sz; if (!isatty(1)) return; + if (ioctl(1, TIOCGWINSZ, &sz) == 0) + pager_columns = sz.ws_col; if (!pager) { if (!pager_program) perf_config(perf_default_config, NULL); @@ -98,3 +103,13 @@ int pager_in_use(void) env = getenv("PERF_PAGER_IN_USE"); return env ? perf_config_bool("PERF_PAGER_IN_USE", env) : 0; } + +int pager_get_columns(void) +{ + char *s; + + s = getenv("COLUMNS"); + if (s) + return atoi(s); + return (pager_columns ? pager_columns : 80) - 2; +} diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c index fa21319..8714f9a 100644 --- a/tools/perf/util/pmu.c +++ b/tools/perf/util/pmu.c @@ -9,6 +9,7 @@ #include "pmu.h" #include "parse-events.h" #include "cpumap.h" +#include "cache.h" #include "jevents.h" const char *json_file; @@ -789,15 +790,6 @@ static void wordwrap(char *s, int start, int max, int corr) } } -static int get_columns(void) -{ - /* - * Should ask the terminal with TIOCGWINSZ here, but we - * need the original fd before the pager. - */ - return 79; -} - void print_pmu_events(const char *event_glob, bool name_only) { struct perf_pmu *pmu; @@ -807,7 +799,7 @@ void print_pmu_events(const char *event_glob, bool name_only) int len, j; struct pair *aliases; int numdesc = 0; - int columns = get_columns(); + int columns = pager_get_columns(); pmu = NULL; len = 0; -- 1.9.3 ^ permalink raw reply related [flat|nested] 23+ messages in thread
* [PATCH 08/10] perf, tools: Add a new pmu interface to iterate over all events 2014-07-30 23:22 perf: Add support for full Intel event lists v8 Andi Kleen ` (6 preceding siblings ...) 2014-07-30 23:22 ` [PATCH 07/10] perf, tools: Query terminal width and use in perf list Andi Kleen @ 2014-07-30 23:22 ` Andi Kleen 2014-07-30 23:22 ` [PATCH 09/10] perf, tools, test: Add test case for alias and JSON parsing Andi Kleen ` (2 subsequent siblings) 10 siblings, 0 replies; 23+ messages in thread From: Andi Kleen @ 2014-07-30 23:22 UTC (permalink / raw) To: jolsa; +Cc: linux-kernel, namhyung, acme, mingo, peterz, Andi Kleen From: Andi Kleen <ak@linux.intel.com> With calling a callback. To be used in test code added in the next patch. Signed-off-by: Andi Kleen <ak@linux.intel.com> --- tools/perf/util/pmu.c | 18 ++++++++++++++++++ tools/perf/util/pmu.h | 2 ++ 2 files changed, 20 insertions(+) diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c index 8714f9a..397e400 100644 --- a/tools/perf/util/pmu.c +++ b/tools/perf/util/pmu.c @@ -869,3 +869,21 @@ bool pmu_have_event(const char *pname, const char *name) } return false; } + +int pmu_iterate_events(int (*func)(const char *pmu, const char *name)) +{ + int ret = 0; + struct perf_pmu *pmu; + struct perf_pmu_alias *alias; + + perf_pmu__find("cpu"); /* Load PMUs */ + pmu = NULL; + while ((pmu = perf_pmu__scan(pmu)) != NULL) { + list_for_each_entry(alias, &pmu->aliases, list) { + ret = func(pmu->name, alias->name); + if (ret != 0) + break; + } + } + return ret; +} diff --git a/tools/perf/util/pmu.h b/tools/perf/util/pmu.h index 583d21e..87a1da4 100644 --- a/tools/perf/util/pmu.h +++ b/tools/perf/util/pmu.h @@ -47,5 +47,7 @@ bool pmu_have_event(const char *pname, const char *name); int perf_pmu__test(void); +int pmu_iterate_events(int (*func)(const char *, const char *name)); + extern const char *json_file; #endif /* __PMU_H */ -- 1.9.3 ^ permalink raw reply related [flat|nested] 23+ messages in thread
* [PATCH 09/10] perf, tools, test: Add test case for alias and JSON parsing 2014-07-30 23:22 perf: Add support for full Intel event lists v8 Andi Kleen ` (7 preceding siblings ...) 2014-07-30 23:22 ` [PATCH 08/10] perf, tools: Add a new pmu interface to iterate over all events Andi Kleen @ 2014-07-30 23:22 ` Andi Kleen 2014-07-30 23:22 ` [PATCH 10/10] perf, tools: Add a --no-desc flag to perf list Andi Kleen 2014-11-24 22:37 ` perf: Add support for full Intel event lists v8 Sukadev Bhattiprolu 10 siblings, 0 replies; 23+ messages in thread From: Andi Kleen @ 2014-07-30 23:22 UTC (permalink / raw) To: jolsa; +Cc: linux-kernel, namhyung, acme, mingo, peterz, Andi Kleen From: Andi Kleen <ak@linux.intel.com> Add a simple test case to perf test that parses all the available events, including json events. This needs adding an all event iterator to pmu.c v2: Rename identifiers v3: Only iterate cpu pmu to avoid bogus errors. Move pmu iterator to extra patch v4: Include aliases.c again v5: Include util/debug.h Acked-by: Namhyung Kim <namhyung@kernel.org> Signed-off-by: Andi Kleen <ak@linux.intel.com> --- tools/perf/Makefile.perf | 1 + tools/perf/tests/aliases.c | 59 +++++++++++++++++++++++++++++++++++++++++ tools/perf/tests/builtin-test.c | 4 +++ tools/perf/tests/tests.h | 1 + 4 files changed, 65 insertions(+) create mode 100644 tools/perf/tests/aliases.c diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index f9cce8e..664c538 100644 --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf @@ -422,6 +422,7 @@ endif LIB_OBJS += $(OUTPUT)tests/code-reading.o LIB_OBJS += $(OUTPUT)tests/sample-parsing.o LIB_OBJS += $(OUTPUT)tests/parse-no-sample-id-all.o +LIB_OBJS += $(OUTPUT)tests/aliases.o ifndef NO_DWARF_UNWIND ifeq ($(ARCH),$(filter $(ARCH),x86 arm)) LIB_OBJS += $(OUTPUT)tests/dwarf-unwind.o diff --git a/tools/perf/tests/aliases.c b/tools/perf/tests/aliases.c new file mode 100644 index 0000000..4209e51 --- /dev/null +++ b/tools/perf/tests/aliases.c @@ -0,0 +1,59 @@ +/* Check if we can set up all aliases and can read JSON files */ +#include <stdlib.h> +#include "tests.h" +#include "pmu.h" +#include "evlist.h" +#include "parse-events.h" +#include "util/debug.h" + +static struct perf_evlist *evlist; + +static int num_events; +static int failed; + +static int test__event(const char *pmu, const char *name) +{ + int ret; + + /* Not supported for now */ + if (strcmp(pmu, "cpu")) + return 0; + + ret = parse_events(evlist, name); + + if (ret) { + /* + * We only print on failure because common perf setups + * have events that cannot be parsed. + */ + fprintf(stderr, "invalid or unsupported event: '%s'\n", name); + ret = 0; + failed++; + } else + num_events++; + return ret; +} + +int test__aliases(void) +{ + int err; + + /* Download JSON files */ + /* XXX assumes perf is installed */ + /* For now user must manually download */ + if (0 && system("perf download > /dev/null") < 0) { + /* Don't error out for this for now */ + fprintf(stderr, "perf download failed\n"); + } + + evlist = perf_evlist__new(); + if (evlist == NULL) + return -ENOMEM; + + err = pmu_iterate_events(test__event); + fprintf(stderr, " Parsed %d events :", num_events); + if (failed > 0) + pr_debug(" %d events failed", failed); + perf_evlist__delete(evlist); + return err; +} diff --git a/tools/perf/tests/builtin-test.c b/tools/perf/tests/builtin-test.c index 6f8b01b..bb37ac2 100644 --- a/tools/perf/tests/builtin-test.c +++ b/tools/perf/tests/builtin-test.c @@ -154,6 +154,10 @@ static struct test { .func = test__hists_cumulate, }, { + .desc = "Test parsing JSON aliases", + .func = test__aliases, + }, + { .func = NULL, }, }; diff --git a/tools/perf/tests/tests.h b/tools/perf/tests/tests.h index ed64790..ab92ad9 100644 --- a/tools/perf/tests/tests.h +++ b/tools/perf/tests/tests.h @@ -48,6 +48,7 @@ int test__mmap_thread_lookup(void); int test__thread_mg_share(void); int test__hists_output(void); int test__hists_cumulate(void); +int test__aliases(void); #if defined(__x86_64__) || defined(__i386__) || defined(__arm__) #ifdef HAVE_DWARF_UNWIND_SUPPORT -- 1.9.3 ^ permalink raw reply related [flat|nested] 23+ messages in thread
* [PATCH 10/10] perf, tools: Add a --no-desc flag to perf list 2014-07-30 23:22 perf: Add support for full Intel event lists v8 Andi Kleen ` (8 preceding siblings ...) 2014-07-30 23:22 ` [PATCH 09/10] perf, tools, test: Add test case for alias and JSON parsing Andi Kleen @ 2014-07-30 23:22 ` Andi Kleen 2014-11-24 22:37 ` perf: Add support for full Intel event lists v8 Sukadev Bhattiprolu 10 siblings, 0 replies; 23+ messages in thread From: Andi Kleen @ 2014-07-30 23:22 UTC (permalink / raw) To: jolsa; +Cc: linux-kernel, namhyung, acme, mingo, peterz, Andi Kleen From: Andi Kleen <ak@linux.intel.com> Add a --no-desc flag to perf list to not print the event descriptions that were earlier added for JSON events. This may be useful to get a less crowded listing. It's still default to print descriptions as that is the more useful default for most users. Before: % perf list ... baclears.any [Counts the total number when the front end is resteered, mainly when the BPU cannot provide a correct prediction and this is corrected by other branch handling mechanisms at the front end] br_inst_exec.all_branches [Speculative and retired branches] After: % perf list --no-desc ... baclears.any [Kernel PMU event] br_inst_exec.all_branches [Kernel PMU event] v2: Rename --quiet to --no-desc. Add option to man page. Signed-off-by: Andi Kleen <ak@linux.intel.com> --- tools/perf/Documentation/perf-list.txt | 5 ++++- tools/perf/builtin-list.c | 14 +++++++++----- tools/perf/util/parse-events.c | 4 ++-- tools/perf/util/parse-events.h | 2 +- tools/perf/util/pmu.c | 4 ++-- tools/perf/util/pmu.h | 2 +- 6 files changed, 19 insertions(+), 12 deletions(-) diff --git a/tools/perf/Documentation/perf-list.txt b/tools/perf/Documentation/perf-list.txt index da03992..3e56fc1 100644 --- a/tools/perf/Documentation/perf-list.txt +++ b/tools/perf/Documentation/perf-list.txt @@ -8,7 +8,7 @@ perf-list - List all symbolic event types SYNOPSIS -------- [verse] -'perf list' [hw|sw|cache|tracepoint|pmu|event_glob] +'perf list' [--no-desc] [hw|sw|cache|tracepoint|pmu|event_glob] DESCRIPTION ----------- @@ -23,6 +23,9 @@ automatically downloaded with perf download. The JSON event file can be also specified with the EVENTMAP environment variable. +--no-desc:: +Don't print descriptions. + [[EVENT_MODIFIERS]] EVENT MODIFIERS --------------- diff --git a/tools/perf/builtin-list.c b/tools/perf/builtin-list.c index 086c96f..68752a1 100644 --- a/tools/perf/builtin-list.c +++ b/tools/perf/builtin-list.c @@ -16,16 +16,20 @@ #include "util/pmu.h" #include "util/parse-options.h" +static bool desc_flag = true; + int cmd_list(int argc, const char **argv, const char *prefix __maybe_unused) { int i; const struct option list_options[] = { OPT_STRING(0, "events-file", &json_file, "json file", "Read event json file"), + OPT_BOOLEAN('d', "desc", &desc_flag, + "Print extra event descriptions. --no-desc to not print."), OPT_END() }; const char * const list_usage[] = { - "perf list [hw|sw|cache|tracepoint|pmu|event_glob]", + "perf list [--events-file FILE] [--no-desc] [hw|sw|cache|tracepoint|pmu|event_glob]", NULL }; @@ -35,7 +39,7 @@ int cmd_list(int argc, const char **argv, const char *prefix __maybe_unused) setup_pager(); if (argc == 0) { - print_events(NULL, false); + print_events(NULL, false, !desc_flag); return 0; } @@ -54,15 +58,15 @@ int cmd_list(int argc, const char **argv, const char *prefix __maybe_unused) strcmp(argv[i], "hwcache") == 0) print_hwcache_events(NULL, false); else if (strcmp(argv[i], "pmu") == 0) - print_pmu_events(NULL, false); + print_pmu_events(NULL, false, !desc_flag); else if (strcmp(argv[i], "--raw-dump") == 0) - print_events(NULL, true); + print_events(NULL, true, !desc_flag); else { char *sep = strchr(argv[i], ':'), *s; int sep_idx; if (sep == NULL) { - print_events(argv[i], false); + print_events(argv[i], false, !desc_flag); continue; } sep_idx = sep - argv[i]; diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c index 1e15df1..e2badf3 100644 --- a/tools/perf/util/parse-events.c +++ b/tools/perf/util/parse-events.c @@ -1231,7 +1231,7 @@ static void print_symbol_events(const char *event_glob, unsigned type, /* * Print the help text for the event symbols: */ -void print_events(const char *event_glob, bool name_only) +void print_events(const char *event_glob, bool name_only, bool quiet) { if (!name_only) { printf("\n"); @@ -1246,7 +1246,7 @@ void print_events(const char *event_glob, bool name_only) print_hwcache_events(event_glob, name_only); - print_pmu_events(event_glob, name_only); + print_pmu_events(event_glob, name_only, quiet); if (event_glob != NULL) return; diff --git a/tools/perf/util/parse-events.h b/tools/perf/util/parse-events.h index df094b4..f3ef0dc 100644 --- a/tools/perf/util/parse-events.h +++ b/tools/perf/util/parse-events.h @@ -100,7 +100,7 @@ void parse_events_update_lists(struct list_head *list_event, struct list_head *list_all); void parse_events_error(void *data, void *scanner, char const *msg); -void print_events(const char *event_glob, bool name_only); +void print_events(const char *event_glob, bool name_only, bool quiet); void print_events_type(u8 type); void print_tracepoint_events(const char *subsys_glob, const char *event_glob, bool name_only); diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c index 397e400..b103932 100644 --- a/tools/perf/util/pmu.c +++ b/tools/perf/util/pmu.c @@ -790,7 +790,7 @@ static void wordwrap(char *s, int start, int max, int corr) } } -void print_pmu_events(const char *event_glob, bool name_only) +void print_pmu_events(const char *event_glob, bool name_only, bool quiet_flag) { struct perf_pmu *pmu; struct perf_pmu_alias *alias; @@ -838,7 +838,7 @@ void print_pmu_events(const char *event_glob, bool name_only) printf("%s ", aliases[j].name); continue; } - if (aliases[j].desc) { + if (aliases[j].desc && !quiet_flag) { if (numdesc++ == 0 && printed) printf("\n"); printf(" %-50s [", aliases[j].name); diff --git a/tools/perf/util/pmu.h b/tools/perf/util/pmu.h index 87a1da4..9b22d0f 100644 --- a/tools/perf/util/pmu.h +++ b/tools/perf/util/pmu.h @@ -42,7 +42,7 @@ int perf_pmu__format_parse(char *dir, struct list_head *head); struct perf_pmu *perf_pmu__scan(struct perf_pmu *pmu); -void print_pmu_events(const char *event_glob, bool name_only); +void print_pmu_events(const char *event_glob, bool name_only, bool quiet); bool pmu_have_event(const char *pname, const char *name); int perf_pmu__test(void); -- 1.9.3 ^ permalink raw reply related [flat|nested] 23+ messages in thread
* Re: perf: Add support for full Intel event lists v8 2014-07-30 23:22 perf: Add support for full Intel event lists v8 Andi Kleen ` (9 preceding siblings ...) 2014-07-30 23:22 ` [PATCH 10/10] perf, tools: Add a --no-desc flag to perf list Andi Kleen @ 2014-11-24 22:37 ` Sukadev Bhattiprolu 2014-11-25 9:33 ` Jiri Olsa 10 siblings, 1 reply; 23+ messages in thread From: Sukadev Bhattiprolu @ 2014-11-24 22:37 UTC (permalink / raw) To: Andi Kleen Cc: jolsa, linux-kernel, namhyung, acme, mingo, peterz, Paul Mackerras, Michael Ellerman Andi Kleen [andi@firstfloor.org] wrote: | Since it seems the download mechanism is controversal, | I removed the downloader for now until a suitable distribution | method with kernel.org can be established. This is just | the rest of the perf JSON event code that should hopefully | not be controversal. Ingo, Jiri, Andi, Can we get this patchset merged please ? It is a step forward in eliminating raw event codes right ? We added hundreds of events to sysfs for Power7. We don't want to do the same for Power8 because this JSON file solution is clearly better. But we currently have a regression in functionality from Power7 to Power8 :-( Even if 'perf download' is left out this patchset is still useful IMHO. Users (specially those who currently struggle with raw codes, are highly qualified and) could wget the JSON files as and when needed. Being able to install the JSON files and download updates is a big plus, but is something thse users can live without for now. Sukadev ^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: perf: Add support for full Intel event lists v8 2014-11-24 22:37 ` perf: Add support for full Intel event lists v8 Sukadev Bhattiprolu @ 2014-11-25 9:33 ` Jiri Olsa 0 siblings, 0 replies; 23+ messages in thread From: Jiri Olsa @ 2014-11-25 9:33 UTC (permalink / raw) To: Sukadev Bhattiprolu Cc: Andi Kleen, linux-kernel, namhyung, acme, mingo, peterz, Paul Mackerras, Michael Ellerman On Mon, Nov 24, 2014 at 02:37:36PM -0800, Sukadev Bhattiprolu wrote: > Andi Kleen [andi@firstfloor.org] wrote: > > | Since it seems the download mechanism is controversal, > | I removed the downloader for now until a suitable distribution > | method with kernel.org can be established. This is just > | the rest of the perf JSON event code that should hopefully > | not be controversal. > > Ingo, Jiri, Andi, > > Can we get this patchset merged please ? It is a step forward > in eliminating raw event codes right ? > > We added hundreds of events to sysfs for Power7. We don't > want to do the same for Power8 because this JSON file solution > is clearly better. > > But we currently have a regression in functionality from Power7 > to Power8 :-( > > Even if 'perf download' is left out this patchset is still > useful IMHO. Users (specially those who currently struggle > with raw codes, are highly qualified and) could wget the > JSON files as and when needed. > > Being able to install the JSON files and download updates is > a big plus, but is something thse users can live without for > now. hi, I talked to Andi about this on LinuxCon and he said he works on that.. his current struggle was to get the ftp space IIRC not sure whats the current status now, but I had the feeling it wont take long.. jirka ^ permalink raw reply [flat|nested] 23+ messages in thread
* [PATCH 0/10] perf: Add support for PMU events in JSON format
@ 2015-05-27 21:23 Sukadev Bhattiprolu
2015-05-27 21:23 ` [PATCH 01/10] perf, tools: Add jsmn `jasmine' JSON parser Sukadev Bhattiprolu
0 siblings, 1 reply; 23+ messages in thread
From: Sukadev Bhattiprolu @ 2015-05-27 21:23 UTC (permalink / raw)
To: mingo, ak, Michael Ellerman, Jiri Olsa, Arnaldo Carvalho de Melo,
Paul Mackerras
Cc: namhyung, linuxppc-dev, linux-kernel
CPUs support a large number of performance monitoring events (PMU events)
and often these events are very specific to an architecture/model of the
CPU. To use most of these PMU events with perf we currently have to identify
the events by their raw codes:
perf stat -e r100f2 sleep 1
This patchset allows architectures to specify these PMU events in a JSON
files which are defined in the tools/perf/pmu-events/arch/ directory of
the mainline tree
Eg: snippet from 004d0100.json (in patch 4)
[
{
"EventCode": "0x100f2",
"EventName": "PM_1PLUS_PPC_CMPL",
"BriefDescription": "1 or more ppc insts finished,",
"PublicDescription": "1 or more ppc insts finished (completed).,"
},
]
When building the perf tool, this patchset, first builds/uses a 'jevents'
which locates all the JSON files for the architecture (currently Powerpc).
The jevents binary then translates the JSON files into into a C-style
"PMU events table":
struct pmu_event pme_power8[] = {
...
{
.name = "pm_1plus_ppc_cmpl",
.event = "event=0x100f2",
.desc = "1 or more ppc insts finished,",
},
...
}
where the "power8" in the table name is derived from the name of the JSON file.
The jevents binary also looks for a "mapfile" to map a processor model/
version to a specific events table:
$ cat mapfile.csv
004b0000,1,power8.json,core
004c0000,1,power8.json,core
004d0000,1,power8.json,core
and uses this to build a mapping table:
struct pmu_events_map pmu_events_map[] = {
{
.cpuid = "004b0000",
.version = "1",
.type = "core",
.table = pme_power8
},
This mapping and events tables for the architecture are then included in
the perf binary during build.
At run time, perf identifies the specific events table, based on the model
of the CPU perf is running on. Perf uses that table to create event aliases
which would allow the user to specify the event as:
perf stat -e pm_1plus_ppc_cmpl sleep 1
Note:
- All known events tables for the architecture are included in the
perf binary.
- Inconsistencies between the JSON files and the mapfile can result
in build failures in perf (although jevents try to recover from
some and continue the build by leaving out event aliases).
- For architectures that don't have any JSON files, an empty mapping
table is created and they should continue to build)
Thanks to input from Andi Kleen, Jiri Olsa, Namhyung Kim and Ingo Molnar.
These patches are available from
git@github.com:sukadev/linux.git #branch json-v11
Andi Kleen (8):
perf, tools: Add jsmn `jasmine' JSON parser
jevents: Program to convert JSON file to C style file
perf, tools: Handle header line in mapfile
perf, tools: Allow events with dot
perf, tools: Support CPU id matching for x86 v2
perf, tools: Support alias descriptions
perf, tools: Query terminal width and use in perf list
perf, tools: Add a --no-desc flag to perf list
Sukadev Bhattiprolu (2):
Use pmu_events_map table to create event aliases
perf: Add power8 PMU events in JSON format
tools/perf/Documentation/perf-list.txt | 8 +-
tools/perf/Makefile.perf | 25 +-
tools/perf/arch/powerpc/util/header.c | 11 +
tools/perf/arch/x86/util/header.c | 24 +-
tools/perf/builtin-list.c | 12 +-
tools/perf/pmu-events/Build | 10 +
tools/perf/pmu-events/README | 67 +
tools/perf/pmu-events/arch/powerpc/mapfile.csv | 17 +
tools/perf/pmu-events/arch/powerpc/power8.json | 6380 ++++++++++++++++++++++++
tools/perf/pmu-events/jevents.c | 686 +++
tools/perf/pmu-events/jevents.h | 17 +
tools/perf/pmu-events/jsmn.c | 313 ++
tools/perf/pmu-events/jsmn.h | 67 +
tools/perf/pmu-events/json.c | 162 +
tools/perf/pmu-events/json.h | 36 +
tools/perf/pmu-events/pmu-events.h | 35 +
tools/perf/util/cache.h | 1 +
tools/perf/util/header.h | 3 +-
tools/perf/util/pager.c | 15 +
tools/perf/util/parse-events.c | 4 +-
tools/perf/util/parse-events.h | 2 +-
tools/perf/util/parse-events.l | 5 +-
tools/perf/util/pmu.c | 185 +-
tools/perf/util/pmu.h | 3 +-
24 files changed, 8036 insertions(+), 52 deletions(-)
create mode 100644 tools/perf/pmu-events/Build
create mode 100644 tools/perf/pmu-events/README
create mode 100644 tools/perf/pmu-events/arch/powerpc/mapfile.csv
create mode 100644 tools/perf/pmu-events/arch/powerpc/power8.json
create mode 100644 tools/perf/pmu-events/jevents.c
create mode 100644 tools/perf/pmu-events/jevents.h
create mode 100644 tools/perf/pmu-events/jsmn.c
create mode 100644 tools/perf/pmu-events/jsmn.h
create mode 100644 tools/perf/pmu-events/json.c
create mode 100644 tools/perf/pmu-events/json.h
create mode 100644 tools/perf/pmu-events/pmu-events.h
--
1.7.9.5
^ permalink raw reply [flat|nested] 23+ messages in thread* [PATCH 01/10] perf, tools: Add jsmn `jasmine' JSON parser 2015-05-27 21:23 [PATCH 0/10] perf: Add support for PMU events in JSON format Sukadev Bhattiprolu @ 2015-05-27 21:23 ` Sukadev Bhattiprolu 0 siblings, 0 replies; 23+ messages in thread From: Sukadev Bhattiprolu @ 2015-05-27 21:23 UTC (permalink / raw) To: mingo, ak, Michael Ellerman, Jiri Olsa, Arnaldo Carvalho de Melo, Paul Mackerras Cc: namhyung, linuxppc-dev, linux-kernel From: Andi Kleen <ak@linux.intel.com> I need a JSON parser. This adds the simplest JSON parser I could find -- Serge Zaitsev's jsmn `jasmine' -- to the perf library. I merely converted it to (mostly) Linux style and added support for non 0 terminated input. The parser is quite straight forward and does not copy any data, just returns tokens with offsets into the input buffer. So it's relatively efficient and simple to use. The code is not fully checkpatch clean, but I didn't want to completely fork the upstream code. Original source: http://zserge.bitbucket.org/jsmn.html In addition I added a simple wrapper that mmaps a json file and provides some straight forward access functions. Used in follow-on patches to parse event files. Acked-by: Namhyung Kim <namhyung@kernel.org> Signed-off-by: Andi Kleen <ak@linux.intel.com> Signed-off-by: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com> --- v2: Address review feedback. v3: Minor checkpatch fixes. v4 (by Sukadev Bhattiprolu) - Rebase to 4.0 and fix minor conflicts in tools/perf/Makefile.perf - Report error if specified events file is invalid. v5 (Sukadev Bhattiprolu) - Move files to tools/perf/pmu-events/ since parsing of JSON file now occurs when _building_ rather than running perf. --- tools/perf/pmu-events/jsmn.c | 313 ++++++++++++++++++++++++++++++++++++++++++ tools/perf/pmu-events/jsmn.h | 67 +++++++++ tools/perf/pmu-events/json.c | 162 ++++++++++++++++++++++ tools/perf/pmu-events/json.h | 36 +++++ 4 files changed, 578 insertions(+) create mode 100644 tools/perf/pmu-events/jsmn.c create mode 100644 tools/perf/pmu-events/jsmn.h create mode 100644 tools/perf/pmu-events/json.c create mode 100644 tools/perf/pmu-events/json.h diff --git a/tools/perf/pmu-events/jsmn.c b/tools/perf/pmu-events/jsmn.c new file mode 100644 index 0000000..11d1fa1 --- /dev/null +++ b/tools/perf/pmu-events/jsmn.c @@ -0,0 +1,313 @@ +/* + * Copyright (c) 2010 Serge A. Zaitsev + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + * + * Slightly modified by AK to not assume 0 terminated input. + */ + +#include <stdlib.h> +#include "jsmn.h" + +/* + * Allocates a fresh unused token from the token pool. + */ +static jsmntok_t *jsmn_alloc_token(jsmn_parser *parser, + jsmntok_t *tokens, size_t num_tokens) +{ + jsmntok_t *tok; + + if ((unsigned)parser->toknext >= num_tokens) + return NULL; + tok = &tokens[parser->toknext++]; + tok->start = tok->end = -1; + tok->size = 0; + return tok; +} + +/* + * Fills token type and boundaries. + */ +static void jsmn_fill_token(jsmntok_t *token, jsmntype_t type, + int start, int end) +{ + token->type = type; + token->start = start; + token->end = end; + token->size = 0; +} + +/* + * Fills next available token with JSON primitive. + */ +static jsmnerr_t jsmn_parse_primitive(jsmn_parser *parser, const char *js, + size_t len, + jsmntok_t *tokens, size_t num_tokens) +{ + jsmntok_t *token; + int start; + + start = parser->pos; + + for (; parser->pos < len; parser->pos++) { + switch (js[parser->pos]) { +#ifndef JSMN_STRICT + /* + * In strict mode primitive must be followed by "," + * or "}" or "]" + */ + case ':': +#endif + case '\t': + case '\r': + case '\n': + case ' ': + case ',': + case ']': + case '}': + goto found; + default: + break; + } + if (js[parser->pos] < 32 || js[parser->pos] >= 127) { + parser->pos = start; + return JSMN_ERROR_INVAL; + } + } +#ifdef JSMN_STRICT + /* + * In strict mode primitive must be followed by a + * comma/object/array. + */ + parser->pos = start; + return JSMN_ERROR_PART; +#endif + +found: + token = jsmn_alloc_token(parser, tokens, num_tokens); + if (token == NULL) { + parser->pos = start; + return JSMN_ERROR_NOMEM; + } + jsmn_fill_token(token, JSMN_PRIMITIVE, start, parser->pos); + parser->pos--; /* parent sees closing brackets */ + return JSMN_SUCCESS; +} + +/* + * Fills next token with JSON string. + */ +static jsmnerr_t jsmn_parse_string(jsmn_parser *parser, const char *js, + size_t len, + jsmntok_t *tokens, size_t num_tokens) +{ + jsmntok_t *token; + int start = parser->pos; + + /* Skip starting quote */ + parser->pos++; + + for (; parser->pos < len; parser->pos++) { + char c = js[parser->pos]; + + /* Quote: end of string */ + if (c == '\"') { + token = jsmn_alloc_token(parser, tokens, num_tokens); + if (token == NULL) { + parser->pos = start; + return JSMN_ERROR_NOMEM; + } + jsmn_fill_token(token, JSMN_STRING, start+1, + parser->pos); + return JSMN_SUCCESS; + } + + /* Backslash: Quoted symbol expected */ + if (c == '\\') { + parser->pos++; + switch (js[parser->pos]) { + /* Allowed escaped symbols */ + case '\"': + case '/': + case '\\': + case 'b': + case 'f': + case 'r': + case 'n': + case 't': + break; + /* Allows escaped symbol \uXXXX */ + case 'u': + /* TODO */ + break; + /* Unexpected symbol */ + default: + parser->pos = start; + return JSMN_ERROR_INVAL; + } + } + } + parser->pos = start; + return JSMN_ERROR_PART; +} + +/* + * Parse JSON string and fill tokens. + */ +jsmnerr_t jsmn_parse(jsmn_parser *parser, const char *js, size_t len, + jsmntok_t *tokens, unsigned int num_tokens) +{ + jsmnerr_t r; + int i; + jsmntok_t *token; + + for (; parser->pos < len; parser->pos++) { + char c; + jsmntype_t type; + + c = js[parser->pos]; + switch (c) { + case '{': + case '[': + token = jsmn_alloc_token(parser, tokens, num_tokens); + if (token == NULL) + return JSMN_ERROR_NOMEM; + if (parser->toksuper != -1) + tokens[parser->toksuper].size++; + token->type = (c == '{' ? JSMN_OBJECT : JSMN_ARRAY); + token->start = parser->pos; + parser->toksuper = parser->toknext - 1; + break; + case '}': + case ']': + type = (c == '}' ? JSMN_OBJECT : JSMN_ARRAY); + for (i = parser->toknext - 1; i >= 0; i--) { + token = &tokens[i]; + if (token->start != -1 && token->end == -1) { + if (token->type != type) + return JSMN_ERROR_INVAL; + parser->toksuper = -1; + token->end = parser->pos + 1; + break; + } + } + /* Error if unmatched closing bracket */ + if (i == -1) + return JSMN_ERROR_INVAL; + for (; i >= 0; i--) { + token = &tokens[i]; + if (token->start != -1 && token->end == -1) { + parser->toksuper = i; + break; + } + } + break; + case '\"': + r = jsmn_parse_string(parser, js, len, tokens, + num_tokens); + if (r < 0) + return r; + if (parser->toksuper != -1) + tokens[parser->toksuper].size++; + break; + case '\t': + case '\r': + case '\n': + case ':': + case ',': + case ' ': + break; +#ifdef JSMN_STRICT + /* + * In strict mode primitives are: + * numbers and booleans. + */ + case '-': + case '0': + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': + case '8': + case '9': + case 't': + case 'f': + case 'n': +#else + /* + * In non-strict mode every unquoted value + * is a primitive. + */ + /*FALL THROUGH */ + default: +#endif + r = jsmn_parse_primitive(parser, js, len, tokens, + num_tokens); + if (r < 0) + return r; + if (parser->toksuper != -1) + tokens[parser->toksuper].size++; + break; + +#ifdef JSMN_STRICT + /* Unexpected char in strict mode */ + default: + return JSMN_ERROR_INVAL; +#endif + } + } + + for (i = parser->toknext - 1; i >= 0; i--) { + /* Unmatched opened object or array */ + if (tokens[i].start != -1 && tokens[i].end == -1) + return JSMN_ERROR_PART; + } + + return JSMN_SUCCESS; +} + +/* + * Creates a new parser based over a given buffer with an array of tokens + * available. + */ +void jsmn_init(jsmn_parser *parser) +{ + parser->pos = 0; + parser->toknext = 0; + parser->toksuper = -1; +} + +const char *jsmn_strerror(jsmnerr_t err) +{ + switch (err) { + case JSMN_ERROR_NOMEM: + return "No enough tokens"; + case JSMN_ERROR_INVAL: + return "Invalid character inside JSON string"; + case JSMN_ERROR_PART: + return "The string is not a full JSON packet, more bytes expected"; + case JSMN_SUCCESS: + return "Success"; + default: + return "Unknown json error"; + } +} diff --git a/tools/perf/pmu-events/jsmn.h b/tools/perf/pmu-events/jsmn.h new file mode 100644 index 0000000..d666b10 --- /dev/null +++ b/tools/perf/pmu-events/jsmn.h @@ -0,0 +1,67 @@ +#ifndef __JSMN_H_ +#define __JSMN_H_ + +/* + * JSON type identifier. Basic types are: + * o Object + * o Array + * o String + * o Other primitive: number, boolean (true/false) or null + */ +typedef enum { + JSMN_PRIMITIVE = 0, + JSMN_OBJECT = 1, + JSMN_ARRAY = 2, + JSMN_STRING = 3 +} jsmntype_t; + +typedef enum { + /* Not enough tokens were provided */ + JSMN_ERROR_NOMEM = -1, + /* Invalid character inside JSON string */ + JSMN_ERROR_INVAL = -2, + /* The string is not a full JSON packet, more bytes expected */ + JSMN_ERROR_PART = -3, + /* Everything was fine */ + JSMN_SUCCESS = 0 +} jsmnerr_t; + +/* + * JSON token description. + * @param type type (object, array, string etc.) + * @param start start position in JSON data string + * @param end end position in JSON data string + */ +typedef struct { + jsmntype_t type; + int start; + int end; + int size; +} jsmntok_t; + +/* + * JSON parser. Contains an array of token blocks available. Also stores + * the string being parsed now and current position in that string + */ +typedef struct { + unsigned int pos; /* offset in the JSON string */ + int toknext; /* next token to allocate */ + int toksuper; /* superior token node, e.g parent object or array */ +} jsmn_parser; + +/* + * Create JSON parser over an array of tokens + */ +void jsmn_init(jsmn_parser *parser); + +/* + * Run JSON parser. It parses a JSON data string into and array of tokens, + * each describing a single JSON object. + */ +jsmnerr_t jsmn_parse(jsmn_parser *parser, const char *js, + size_t len, + jsmntok_t *tokens, unsigned int num_tokens); + +const char *jsmn_strerror(jsmnerr_t err); + +#endif /* __JSMN_H_ */ diff --git a/tools/perf/pmu-events/json.c b/tools/perf/pmu-events/json.c new file mode 100644 index 0000000..87f0c4b --- /dev/null +++ b/tools/perf/pmu-events/json.c @@ -0,0 +1,162 @@ +/* Parse JSON files using the JSMN parser. */ + +/* + * Copyright (c) 2014, Intel Corporation + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, + * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. +*/ + +#include <stdlib.h> +#include <string.h> +#include <sys/mman.h> +#include <sys/stat.h> +#include <sys/fcntl.h> +#include <stdio.h> +#include <errno.h> +#include <unistd.h> +#include "jsmn.h" +#include "json.h" +#include <linux/kernel.h> + + +static char *mapfile(const char *fn, size_t *size) +{ + unsigned ps = sysconf(_SC_PAGESIZE); + struct stat st; + char *map = NULL; + int err; + int fd = open(fn, O_RDONLY); + + if (fd < 0 && verbose && fn) { + pr_err("Error opening events file '%s': %s\n", fn, + strerror(errno)); + } + + if (fd < 0) + return NULL; + err = fstat(fd, &st); + if (err < 0) + goto out; + *size = st.st_size; + map = mmap(NULL, + (st.st_size + ps - 1) & ~(ps - 1), + PROT_READ|PROT_WRITE, MAP_PRIVATE, fd, 0); + if (map == MAP_FAILED) + map = NULL; +out: + close(fd); + return map; +} + +static void unmapfile(char *map, size_t size) +{ + unsigned ps = sysconf(_SC_PAGESIZE); + munmap(map, roundup(size, ps)); +} + +/* + * Parse json file using jsmn. Return array of tokens, + * and mapped file. Caller needs to free array. + */ +jsmntok_t *parse_json(const char *fn, char **map, size_t *size, int *len) +{ + jsmn_parser parser; + jsmntok_t *tokens; + jsmnerr_t res; + unsigned sz; + + *map = mapfile(fn, size); + if (!*map) + return NULL; + /* Heuristic */ + sz = *size * 16; + tokens = malloc(sz); + if (!tokens) + goto error; + jsmn_init(&parser); + res = jsmn_parse(&parser, *map, *size, tokens, + sz / sizeof(jsmntok_t)); + if (res != JSMN_SUCCESS) { + pr_err("%s: json error %s\n", fn, jsmn_strerror(res)); + goto error_free; + } + if (len) + *len = parser.toknext; + return tokens; +error_free: + free(tokens); +error: + unmapfile(*map, *size); + return NULL; +} + +void free_json(char *map, size_t size, jsmntok_t *tokens) +{ + free(tokens); + unmapfile(map, size); +} + +static int countchar(char *map, char c, int end) +{ + int i; + int count = 0; + for (i = 0; i < end; i++) + if (map[i] == c) + count++; + return count; +} + +/* Return line number of a jsmn token */ +int json_line(char *map, jsmntok_t *t) +{ + return countchar(map, '\n', t->start) + 1; +} + +static const char * const jsmn_types[] = { + [JSMN_PRIMITIVE] = "primitive", + [JSMN_ARRAY] = "array", + [JSMN_OBJECT] = "object", + [JSMN_STRING] = "string" +}; + +#define LOOKUP(a, i) ((i) < (sizeof(a)/sizeof(*(a))) ? ((a)[i]) : "?") + +/* Return type name of a jsmn token */ +const char *json_name(jsmntok_t *t) +{ + return LOOKUP(jsmn_types, t->type); +} + +int json_len(jsmntok_t *t) +{ + return t->end - t->start; +} + +/* Is string t equal to s? */ +int json_streq(char *map, jsmntok_t *t, const char *s) +{ + unsigned len = json_len(t); + return len == strlen(s) && !strncasecmp(map + t->start, s, len); +} diff --git a/tools/perf/pmu-events/json.h b/tools/perf/pmu-events/json.h new file mode 100644 index 0000000..6b8337e --- /dev/null +++ b/tools/perf/pmu-events/json.h @@ -0,0 +1,36 @@ +#ifndef JSON_H +#define JSON_H 1 + +#include "jsmn.h" + +jsmntok_t *parse_json(const char *fn, char **map, size_t *size, int *len); +void free_json(char *map, size_t size, jsmntok_t *tokens); +int json_line(char *map, jsmntok_t *t); +const char *json_name(jsmntok_t *t); +int json_streq(char *map, jsmntok_t *t, const char *s); +int json_len(jsmntok_t *t); + +extern int verbose; + +typedef unsigned int bool; + +#ifndef true +#define true 1 +#endif + +extern int eprintf(int level, int var, const char *fmt, ...); +#define pr_fmt(fmt) fmt + +#define pr_err(fmt, ...) \ + eprintf(0, verbose, pr_fmt(fmt), ##__VA_ARGS__) + +#ifndef roundup +#define roundup(x, y) ( \ +{ \ + const typeof(y) __y = y; \ + (((x) + (__y - 1)) / __y) * __y; \ +} \ +) +#endif + +#endif -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 23+ messages in thread
* [PATCH 01/10] perf, tools: Add jsmn `jasmine' JSON parser @ 2014-04-16 18:49 Andi Kleen 2014-04-25 13:17 ` Jiri Olsa 0 siblings, 1 reply; 23+ messages in thread From: Andi Kleen @ 2014-04-16 18:49 UTC (permalink / raw) To: jolsa; +Cc: acme, linux-kernel, namhyung, Andi Kleen From: Andi Kleen <ak@linux.intel.com> I need a JSON parser. This adds the simplest JSON parser I could find -- Serge Zaitsev's jsmn `jasmine' -- to the perf library. I merely converted it to (mostly) Linux style and added support for non 0 terminated input. The parser is quite straight forward and does not copy any data, just returns tokens with offsets into the input buffer. So it's relatively efficient and simple to use. The code is not fully checkpatch clean, but I didn't want to completely fork the upstream code. Original source: http://zserge.bitbucket.org/jsmn.html In addition I added a simple wrapper that mmaps a json file and provides some straight forward access functions. Used in follow-on patches to parse event files. Signed-off-by: Andi Kleen <ak@linux.intel.com> --- tools/perf/Makefile.perf | 4 + tools/perf/util/jsmn.c | 297 +++++++++++++++++++++++++++++++++++++++++++++++ tools/perf/util/jsmn.h | 65 +++++++++++ tools/perf/util/json.c | 155 +++++++++++++++++++++++++ tools/perf/util/json.h | 13 +++ 5 files changed, 534 insertions(+) create mode 100644 tools/perf/util/jsmn.c create mode 100644 tools/perf/util/jsmn.h create mode 100644 tools/perf/util/json.c create mode 100644 tools/perf/util/json.h diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index 50d875d..8381a64 100644 --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf @@ -301,6 +301,8 @@ LIB_H += ui/progress.h LIB_H += ui/util.h LIB_H += ui/ui.h LIB_H += util/data.h +LIB_H += util/jsmn.h +LIB_H += util/json.h LIB_OBJS += $(OUTPUT)util/abspath.o LIB_OBJS += $(OUTPUT)util/alias.o @@ -374,6 +376,8 @@ LIB_OBJS += $(OUTPUT)util/stat.o LIB_OBJS += $(OUTPUT)util/record.o LIB_OBJS += $(OUTPUT)util/srcline.o LIB_OBJS += $(OUTPUT)util/data.o +LIB_OBJS += $(OUTPUT)util/jsmn.o +LIB_OBJS += $(OUTPUT)util/json.o LIB_OBJS += $(OUTPUT)ui/setup.o LIB_OBJS += $(OUTPUT)ui/helpline.o diff --git a/tools/perf/util/jsmn.c b/tools/perf/util/jsmn.c new file mode 100644 index 0000000..3e4b711 --- /dev/null +++ b/tools/perf/util/jsmn.c @@ -0,0 +1,297 @@ +/* + * Copyright (c) 2010 Serge A. Zaitsev + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + * + * Slightly modified by AK to not assume 0 terminated input. + */ + +#include <stdlib.h> +#include "jsmn.h" + +/* + * Allocates a fresh unused token from the token pull. + */ +static jsmntok_t *jsmn_alloc_token(jsmn_parser *parser, + jsmntok_t *tokens, size_t num_tokens) +{ + jsmntok_t *tok; + + if ((unsigned)parser->toknext >= num_tokens) + return NULL; + tok = &tokens[parser->toknext++]; + tok->start = tok->end = -1; + tok->size = 0; + return tok; +} + +/* + * Fills token type and boundaries. + */ +static void jsmn_fill_token(jsmntok_t *token, jsmntype_t type, + int start, int end) +{ + token->type = type; + token->start = start; + token->end = end; + token->size = 0; +} + +/* + * Fills next available token with JSON primitive. + */ +static jsmnerr_t jsmn_parse_primitive(jsmn_parser *parser, const char *js, + size_t len, + jsmntok_t *tokens, size_t num_tokens) +{ + jsmntok_t *token; + int start; + + start = parser->pos; + + for (; parser->pos < len; parser->pos++) { + switch (js[parser->pos]) { +#ifndef JSMN_STRICT + /* + * In strict mode primitive must be followed by "," + * or "}" or "]" + */ + case ':': +#endif + case '\t': + case '\r': + case '\n': + case ' ': + case ',': + case ']': + case '}': + goto found; + default: + break; + } + if (js[parser->pos] < 32 || js[parser->pos] >= 127) { + parser->pos = start; + return JSMN_ERROR_INVAL; + } + } +#ifdef JSMN_STRICT + /* + * In strict mode primitive must be followed by a + * comma/object/array. + */ + parser->pos = start; + return JSMN_ERROR_PART; +#endif + +found: + token = jsmn_alloc_token(parser, tokens, num_tokens); + if (token == NULL) { + parser->pos = start; + return JSMN_ERROR_NOMEM; + } + jsmn_fill_token(token, JSMN_PRIMITIVE, start, parser->pos); + parser->pos--; + return JSMN_SUCCESS; +} + +/* + * Fills next token with JSON string. + */ +static jsmnerr_t jsmn_parse_string(jsmn_parser *parser, const char *js, + size_t len, + jsmntok_t *tokens, size_t num_tokens) +{ + jsmntok_t *token; + int start = parser->pos; + + parser->pos++; + + /* Skip starting quote */ + for (; parser->pos < len; parser->pos++) { + char c = js[parser->pos]; + + /* Quote: end of string */ + if (c == '\"') { + token = jsmn_alloc_token(parser, tokens, num_tokens); + if (token == NULL) { + parser->pos = start; + return JSMN_ERROR_NOMEM; + } + jsmn_fill_token(token, JSMN_STRING, start+1, + parser->pos); + return JSMN_SUCCESS; + } + + /* Backslash: Quoted symbol expected */ + if (c == '\\') { + parser->pos++; + switch (js[parser->pos]) { + /* Allowed escaped symbols */ + case '\"': + case '/': + case '\\': + case 'b': + case 'f': + case 'r': + case 'n': + case 't': + break; + /* Allows escaped symbol \uXXXX */ + case 'u': + /* TODO */ + break; + /* Unexpected symbol */ + default: + parser->pos = start; + return JSMN_ERROR_INVAL; + } + } + } + parser->pos = start; + return JSMN_ERROR_PART; +} + +/* + * Parse JSON string and fill tokens. + */ +jsmnerr_t jsmn_parse(jsmn_parser *parser, const char *js, size_t len, + jsmntok_t *tokens, + unsigned int num_tokens) +{ + jsmnerr_t r; + int i; + jsmntok_t *token; + + for (; parser->pos < len; parser->pos++) { + char c; + jsmntype_t type; + + c = js[parser->pos]; + switch (c) { + case '{': + case '[': + token = jsmn_alloc_token(parser, tokens, num_tokens); + if (token == NULL) + return JSMN_ERROR_NOMEM; + if (parser->toksuper != -1) + tokens[parser->toksuper].size++; + token->type = (c == '{' ? JSMN_OBJECT : JSMN_ARRAY); + token->start = parser->pos; + parser->toksuper = parser->toknext - 1; + break; + case '}': + case ']': + type = (c == '}' ? JSMN_OBJECT : JSMN_ARRAY); + for (i = parser->toknext - 1; i >= 0; i--) { + token = &tokens[i]; + if (token->start != -1 && token->end == -1) { + if (token->type != type) + return JSMN_ERROR_INVAL; + parser->toksuper = -1; + token->end = parser->pos + 1; + break; + } + } + /* Error if unmatched closing bracket */ + if (i == -1) + return JSMN_ERROR_INVAL; + for (; i >= 0; i--) { + token = &tokens[i]; + if (token->start != -1 && token->end == -1) { + parser->toksuper = i; + break; + } + } + break; + case '\"': + r = jsmn_parse_string(parser, js, len, tokens, + num_tokens); + if (r < 0) + return r; + if (parser->toksuper != -1) + tokens[parser->toksuper].size++; + break; + case '\t': + case '\r': + case '\n': + case ':': + case ',': + case ' ': + break; +#ifdef JSMN_STRICT + /* + * In strict mode primitives are: + * numbers and booleans. + */ + case '-': + case '0': + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': + case '8': + case '9': + case 't': + case 'f': + case 'n': +#else + /* + * In non-strict mode every unquoted value + * is a primitive. + */ + default: +#endif + r = jsmn_parse_primitive(parser, js, len, tokens, + num_tokens); + if (r < 0) + return r; + if (parser->toksuper != -1) + tokens[parser->toksuper].size++; + break; + +#ifdef JSMN_STRICT + /* Unexpected char in strict mode */ + default: + return JSMN_ERROR_INVAL; +#endif + } + } + + for (i = parser->toknext - 1; i >= 0; i--) { + /* Unmatched opened object or array */ + if (tokens[i].start != -1 && tokens[i].end == -1) + return JSMN_ERROR_PART; + } + + return JSMN_SUCCESS; +} + +/* + * Creates a new parser based over a given buffer with an array of tokens + * available. + */ +void jsmn_init(jsmn_parser *parser) +{ + parser->pos = 0; + parser->toknext = 0; + parser->toksuper = -1; +} diff --git a/tools/perf/util/jsmn.h b/tools/perf/util/jsmn.h new file mode 100644 index 0000000..8f432b0 --- /dev/null +++ b/tools/perf/util/jsmn.h @@ -0,0 +1,65 @@ +#ifndef __JSMN_H_ +#define __JSMN_H_ + +/* + * JSON type identifier. Basic types are: + * o Object + * o Array + * o String + * o Other primitive: number, boolean (true/false) or null + */ +typedef enum { + JSMN_PRIMITIVE = 0, + JSMN_OBJECT = 1, + JSMN_ARRAY = 2, + JSMN_STRING = 3 +} jsmntype_t; + +typedef enum { + /* Not enough tokens were provided */ + JSMN_ERROR_NOMEM = -1, + /* Invalid character inside JSON string */ + JSMN_ERROR_INVAL = -2, + /* The string is not a full JSON packet, more bytes expected */ + JSMN_ERROR_PART = -3, + /* Everything was fine */ + JSMN_SUCCESS = 0 +} jsmnerr_t; + +/* + * JSON token description. + * @param type type (object, array, string etc.) + * @param start start position in JSON data string + * @param end end position in JSON data string + */ +typedef struct { + jsmntype_t type; + int start; + int end; + int size; +} jsmntok_t; + +/* + * JSON parser. Contains an array of token blocks available. Also stores + * the string being parsed now and current position in that string + */ +typedef struct { + unsigned int pos; /* offset in the JSON string */ + int toknext; /* next token to allocate */ + int toksuper; /* superior token node, e.g parent object or array */ +} jsmn_parser; + +/* + * Create JSON parser over an array of tokens + */ +void jsmn_init(jsmn_parser *parser); + +/* + * Run JSON parser. It parses a JSON data string into and array of tokens, + * each describing a single JSON object. + */ +jsmnerr_t jsmn_parse(jsmn_parser *parser, const char *js, + size_t len, + jsmntok_t *tokens, unsigned int num_tokens); + +#endif /* __JSMN_H_ */ diff --git a/tools/perf/util/json.c b/tools/perf/util/json.c new file mode 100644 index 0000000..e505da9 --- /dev/null +++ b/tools/perf/util/json.c @@ -0,0 +1,155 @@ +/* Parse JSON files using the JSMN parser. */ + +/* + * Copyright (c) 2014, Intel Corporation + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, + * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. +*/ + +#include <stdlib.h> +#include <string.h> +#include <sys/mman.h> +#include <sys/stat.h> +#include <sys/fcntl.h> +#include <stdio.h> +#include <unistd.h> +#include "jsmn.h" +#include "json.h" +#include <linux/kernel.h> + +static char *mapfile(const char *fn, size_t *size) +{ + unsigned ps = sysconf(_SC_PAGESIZE); + struct stat st; + char *map = NULL; + int err; + int fd = open(fn, O_RDONLY); + + if (fd < 0) + return NULL; + err = fstat(fd, &st); + if (err < 0) + goto out; + *size = st.st_size; + map = mmap(NULL, + (st.st_size + ps - 1) & ~(ps -1), + PROT_READ|PROT_WRITE, MAP_PRIVATE, fd, 0); + if (map == (char *)MAP_FAILED) + map = NULL; +out: + close(fd); + return map; +} + +static void unmapfile(char *map, size_t size) +{ + unsigned ps = sysconf(_SC_PAGESIZE); + munmap(map, roundup(size, ps)); +} + +/* + * Parse json file using jsmn. Return array of tokens, + * and mapped file. Caller needs to free array. + */ +jsmntok_t *parse_json(const char *fn, char **map, size_t *size, int *len) +{ + jsmn_parser parser; + jsmntok_t *tokens; + jsmnerr_t res; + unsigned sz; + + *map = mapfile(fn, size); + if (!*map) + return NULL; + /* Heuristic */ + sz = *size * 16; + tokens = malloc(sz); + if (!tokens) + goto error; + jsmn_init(&parser); + res = jsmn_parse(&parser, *map, *size, tokens, + sz / sizeof(jsmntok_t)); + if (res != JSMN_SUCCESS) { + pr_err("%s: json error %d\n", fn, res); + goto error_free; + } + if (len) + *len = parser.toknext; + return tokens; +error_free: + free(tokens); +error: + unmapfile(*map, *size); + return NULL; +} + +void free_json(char *map, size_t size, jsmntok_t *tokens) +{ + free(tokens); + unmapfile(map, size); +} + +static int countchar(char *map, char c, int end) +{ + int i; + int count = 0; + for (i = 0; i < end; i++) + if (map[i] == c) + count++; + return count; +} + +/* Return line number of a jsmn token */ +int json_line(char *map, jsmntok_t *t) +{ + return countchar(map, '\n', t->start) + 1; +} + +static const char *jsmn_types[] = { + [JSMN_PRIMITIVE] = "primitive", + [JSMN_ARRAY] = "array", + [JSMN_OBJECT] = "object", + [JSMN_STRING] = "string" +}; + +#define LOOKUP(a, i) ((i) < (sizeof(a)/sizeof(*(a))) ? ((a)[i]) : "?") + +/* Return type name of a jsmn token */ +const char *json_name(jsmntok_t *t) +{ + return LOOKUP(jsmn_types, t->type); +} + +int json_len(jsmntok_t *t) +{ + return t->end - t->start; +} + +/* Is string t equal to s? */ +int json_streq(char *map, jsmntok_t *t, const char *s) +{ + unsigned len = t->end - t->start; + return len == strlen(s) && !strncasecmp(map + t->start, s, len); +} diff --git a/tools/perf/util/json.h b/tools/perf/util/json.h new file mode 100644 index 0000000..37dd9e9 --- /dev/null +++ b/tools/perf/util/json.h @@ -0,0 +1,13 @@ +#ifndef JSON_H +#define JSON_H 1 + +#include "jsmn.h" + +jsmntok_t *parse_json(const char *fn, char **map, size_t *size, int *len); +void free_json(char *map, size_t size, jsmntok_t *tokens); +int json_line(char *map, jsmntok_t *t); +const char *json_name(jsmntok_t *t); +int json_streq(char *map, jsmntok_t *t, const char *s); +int json_len(jsmntok_t *t); + +#endif -- 1.8.5.3 ^ permalink raw reply related [flat|nested] 23+ messages in thread
* Re: [PATCH 01/10] perf, tools: Add jsmn `jasmine' JSON parser 2014-04-16 18:49 Andi Kleen @ 2014-04-25 13:17 ` Jiri Olsa 2014-04-25 15:07 ` Andi Kleen 0 siblings, 1 reply; 23+ messages in thread From: Jiri Olsa @ 2014-04-25 13:17 UTC (permalink / raw) To: Andi Kleen; +Cc: acme, linux-kernel, namhyung, Andi Kleen hi, I guess this is v3 for: perf: Add support for full Intel event lists v2 right? I did not get the 0/10.. is it just rebase? also 3/10 seems not finished: [PATCH 03/10] fixup! perf, tools: Add support for text descriptions of events and alias add thanks, jirka On Wed, Apr 16, 2014 at 11:49:23AM -0700, Andi Kleen wrote: > From: Andi Kleen <ak@linux.intel.com> > > I need a JSON parser. This adds the simplest JSON > parser I could find -- Serge Zaitsev's jsmn `jasmine' -- > to the perf library. I merely converted it to (mostly) > Linux style and added support for non 0 terminated input. > > The parser is quite straight forward and does not > copy any data, just returns tokens with offsets > into the input buffer. So it's relatively efficient > and simple to use. > > The code is not fully checkpatch clean, but I didn't > want to completely fork the upstream code. > > Original source: http://zserge.bitbucket.org/jsmn.html > > In addition I added a simple wrapper that mmaps a json > file and provides some straight forward access functions. > > Used in follow-on patches to parse event files. > > Signed-off-by: Andi Kleen <ak@linux.intel.com> > --- > tools/perf/Makefile.perf | 4 + > tools/perf/util/jsmn.c | 297 +++++++++++++++++++++++++++++++++++++++++++++++ > tools/perf/util/jsmn.h | 65 +++++++++++ > tools/perf/util/json.c | 155 +++++++++++++++++++++++++ > tools/perf/util/json.h | 13 +++ > 5 files changed, 534 insertions(+) > create mode 100644 tools/perf/util/jsmn.c > create mode 100644 tools/perf/util/jsmn.h > create mode 100644 tools/perf/util/json.c > create mode 100644 tools/perf/util/json.h > > diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf > index 50d875d..8381a64 100644 > --- a/tools/perf/Makefile.perf > +++ b/tools/perf/Makefile.perf > @@ -301,6 +301,8 @@ LIB_H += ui/progress.h > LIB_H += ui/util.h > LIB_H += ui/ui.h > LIB_H += util/data.h > +LIB_H += util/jsmn.h > +LIB_H += util/json.h > > LIB_OBJS += $(OUTPUT)util/abspath.o > LIB_OBJS += $(OUTPUT)util/alias.o > @@ -374,6 +376,8 @@ LIB_OBJS += $(OUTPUT)util/stat.o > LIB_OBJS += $(OUTPUT)util/record.o > LIB_OBJS += $(OUTPUT)util/srcline.o > LIB_OBJS += $(OUTPUT)util/data.o > +LIB_OBJS += $(OUTPUT)util/jsmn.o > +LIB_OBJS += $(OUTPUT)util/json.o > > LIB_OBJS += $(OUTPUT)ui/setup.o > LIB_OBJS += $(OUTPUT)ui/helpline.o > diff --git a/tools/perf/util/jsmn.c b/tools/perf/util/jsmn.c > new file mode 100644 > index 0000000..3e4b711 > --- /dev/null > +++ b/tools/perf/util/jsmn.c > @@ -0,0 +1,297 @@ > +/* > + * Copyright (c) 2010 Serge A. Zaitsev > + * > + * Permission is hereby granted, free of charge, to any person obtaining a copy > + * of this software and associated documentation files (the "Software"), to deal > + * in the Software without restriction, including without limitation the rights > + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell > + * copies of the Software, and to permit persons to whom the Software is > + * furnished to do so, subject to the following conditions: > + * > + * The above copyright notice and this permission notice shall be included in > + * all copies or substantial portions of the Software. > + * > + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR > + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, > + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE > + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER > + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, > + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN > + * THE SOFTWARE. > + * > + * Slightly modified by AK to not assume 0 terminated input. > + */ > + > +#include <stdlib.h> > +#include "jsmn.h" > + > +/* > + * Allocates a fresh unused token from the token pull. > + */ > +static jsmntok_t *jsmn_alloc_token(jsmn_parser *parser, > + jsmntok_t *tokens, size_t num_tokens) > +{ > + jsmntok_t *tok; > + > + if ((unsigned)parser->toknext >= num_tokens) > + return NULL; > + tok = &tokens[parser->toknext++]; > + tok->start = tok->end = -1; > + tok->size = 0; > + return tok; > +} > + > +/* > + * Fills token type and boundaries. > + */ > +static void jsmn_fill_token(jsmntok_t *token, jsmntype_t type, > + int start, int end) > +{ > + token->type = type; > + token->start = start; > + token->end = end; > + token->size = 0; > +} > + > +/* > + * Fills next available token with JSON primitive. > + */ > +static jsmnerr_t jsmn_parse_primitive(jsmn_parser *parser, const char *js, > + size_t len, > + jsmntok_t *tokens, size_t num_tokens) > +{ > + jsmntok_t *token; > + int start; > + > + start = parser->pos; > + > + for (; parser->pos < len; parser->pos++) { > + switch (js[parser->pos]) { > +#ifndef JSMN_STRICT > + /* > + * In strict mode primitive must be followed by "," > + * or "}" or "]" > + */ > + case ':': > +#endif > + case '\t': > + case '\r': > + case '\n': > + case ' ': > + case ',': > + case ']': > + case '}': > + goto found; > + default: > + break; > + } > + if (js[parser->pos] < 32 || js[parser->pos] >= 127) { > + parser->pos = start; > + return JSMN_ERROR_INVAL; > + } > + } > +#ifdef JSMN_STRICT > + /* > + * In strict mode primitive must be followed by a > + * comma/object/array. > + */ > + parser->pos = start; > + return JSMN_ERROR_PART; > +#endif > + > +found: > + token = jsmn_alloc_token(parser, tokens, num_tokens); > + if (token == NULL) { > + parser->pos = start; > + return JSMN_ERROR_NOMEM; > + } > + jsmn_fill_token(token, JSMN_PRIMITIVE, start, parser->pos); > + parser->pos--; > + return JSMN_SUCCESS; > +} > + > +/* > + * Fills next token with JSON string. > + */ > +static jsmnerr_t jsmn_parse_string(jsmn_parser *parser, const char *js, > + size_t len, > + jsmntok_t *tokens, size_t num_tokens) > +{ > + jsmntok_t *token; > + int start = parser->pos; > + > + parser->pos++; > + > + /* Skip starting quote */ > + for (; parser->pos < len; parser->pos++) { > + char c = js[parser->pos]; > + > + /* Quote: end of string */ > + if (c == '\"') { > + token = jsmn_alloc_token(parser, tokens, num_tokens); > + if (token == NULL) { > + parser->pos = start; > + return JSMN_ERROR_NOMEM; > + } > + jsmn_fill_token(token, JSMN_STRING, start+1, > + parser->pos); > + return JSMN_SUCCESS; > + } > + > + /* Backslash: Quoted symbol expected */ > + if (c == '\\') { > + parser->pos++; > + switch (js[parser->pos]) { > + /* Allowed escaped symbols */ > + case '\"': > + case '/': > + case '\\': > + case 'b': > + case 'f': > + case 'r': > + case 'n': > + case 't': > + break; > + /* Allows escaped symbol \uXXXX */ > + case 'u': > + /* TODO */ > + break; > + /* Unexpected symbol */ > + default: > + parser->pos = start; > + return JSMN_ERROR_INVAL; > + } > + } > + } > + parser->pos = start; > + return JSMN_ERROR_PART; > +} > + > +/* > + * Parse JSON string and fill tokens. > + */ > +jsmnerr_t jsmn_parse(jsmn_parser *parser, const char *js, size_t len, > + jsmntok_t *tokens, > + unsigned int num_tokens) > +{ > + jsmnerr_t r; > + int i; > + jsmntok_t *token; > + > + for (; parser->pos < len; parser->pos++) { > + char c; > + jsmntype_t type; > + > + c = js[parser->pos]; > + switch (c) { > + case '{': > + case '[': > + token = jsmn_alloc_token(parser, tokens, num_tokens); > + if (token == NULL) > + return JSMN_ERROR_NOMEM; > + if (parser->toksuper != -1) > + tokens[parser->toksuper].size++; > + token->type = (c == '{' ? JSMN_OBJECT : JSMN_ARRAY); > + token->start = parser->pos; > + parser->toksuper = parser->toknext - 1; > + break; > + case '}': > + case ']': > + type = (c == '}' ? JSMN_OBJECT : JSMN_ARRAY); > + for (i = parser->toknext - 1; i >= 0; i--) { > + token = &tokens[i]; > + if (token->start != -1 && token->end == -1) { > + if (token->type != type) > + return JSMN_ERROR_INVAL; > + parser->toksuper = -1; > + token->end = parser->pos + 1; > + break; > + } > + } > + /* Error if unmatched closing bracket */ > + if (i == -1) > + return JSMN_ERROR_INVAL; > + for (; i >= 0; i--) { > + token = &tokens[i]; > + if (token->start != -1 && token->end == -1) { > + parser->toksuper = i; > + break; > + } > + } > + break; > + case '\"': > + r = jsmn_parse_string(parser, js, len, tokens, > + num_tokens); > + if (r < 0) > + return r; > + if (parser->toksuper != -1) > + tokens[parser->toksuper].size++; > + break; > + case '\t': > + case '\r': > + case '\n': > + case ':': > + case ',': > + case ' ': > + break; > +#ifdef JSMN_STRICT > + /* > + * In strict mode primitives are: > + * numbers and booleans. > + */ > + case '-': > + case '0': > + case '1': > + case '2': > + case '3': > + case '4': > + case '5': > + case '6': > + case '7': > + case '8': > + case '9': > + case 't': > + case 'f': > + case 'n': > +#else > + /* > + * In non-strict mode every unquoted value > + * is a primitive. > + */ > + default: > +#endif > + r = jsmn_parse_primitive(parser, js, len, tokens, > + num_tokens); > + if (r < 0) > + return r; > + if (parser->toksuper != -1) > + tokens[parser->toksuper].size++; > + break; > + > +#ifdef JSMN_STRICT > + /* Unexpected char in strict mode */ > + default: > + return JSMN_ERROR_INVAL; > +#endif > + } > + } > + > + for (i = parser->toknext - 1; i >= 0; i--) { > + /* Unmatched opened object or array */ > + if (tokens[i].start != -1 && tokens[i].end == -1) > + return JSMN_ERROR_PART; > + } > + > + return JSMN_SUCCESS; > +} > + > +/* > + * Creates a new parser based over a given buffer with an array of tokens > + * available. > + */ > +void jsmn_init(jsmn_parser *parser) > +{ > + parser->pos = 0; > + parser->toknext = 0; > + parser->toksuper = -1; > +} > diff --git a/tools/perf/util/jsmn.h b/tools/perf/util/jsmn.h > new file mode 100644 > index 0000000..8f432b0 > --- /dev/null > +++ b/tools/perf/util/jsmn.h > @@ -0,0 +1,65 @@ > +#ifndef __JSMN_H_ > +#define __JSMN_H_ > + > +/* > + * JSON type identifier. Basic types are: > + * o Object > + * o Array > + * o String > + * o Other primitive: number, boolean (true/false) or null > + */ > +typedef enum { > + JSMN_PRIMITIVE = 0, > + JSMN_OBJECT = 1, > + JSMN_ARRAY = 2, > + JSMN_STRING = 3 > +} jsmntype_t; > + > +typedef enum { > + /* Not enough tokens were provided */ > + JSMN_ERROR_NOMEM = -1, > + /* Invalid character inside JSON string */ > + JSMN_ERROR_INVAL = -2, > + /* The string is not a full JSON packet, more bytes expected */ > + JSMN_ERROR_PART = -3, > + /* Everything was fine */ > + JSMN_SUCCESS = 0 > +} jsmnerr_t; > + > +/* > + * JSON token description. > + * @param type type (object, array, string etc.) > + * @param start start position in JSON data string > + * @param end end position in JSON data string > + */ > +typedef struct { > + jsmntype_t type; > + int start; > + int end; > + int size; > +} jsmntok_t; > + > +/* > + * JSON parser. Contains an array of token blocks available. Also stores > + * the string being parsed now and current position in that string > + */ > +typedef struct { > + unsigned int pos; /* offset in the JSON string */ > + int toknext; /* next token to allocate */ > + int toksuper; /* superior token node, e.g parent object or array */ > +} jsmn_parser; > + > +/* > + * Create JSON parser over an array of tokens > + */ > +void jsmn_init(jsmn_parser *parser); > + > +/* > + * Run JSON parser. It parses a JSON data string into and array of tokens, > + * each describing a single JSON object. > + */ > +jsmnerr_t jsmn_parse(jsmn_parser *parser, const char *js, > + size_t len, > + jsmntok_t *tokens, unsigned int num_tokens); > + > +#endif /* __JSMN_H_ */ > diff --git a/tools/perf/util/json.c b/tools/perf/util/json.c > new file mode 100644 > index 0000000..e505da9 > --- /dev/null > +++ b/tools/perf/util/json.c > @@ -0,0 +1,155 @@ > +/* Parse JSON files using the JSMN parser. */ > + > +/* > + * Copyright (c) 2014, Intel Corporation > + * All rights reserved. > + * > + * Redistribution and use in source and binary forms, with or without > + * modification, are permitted provided that the following conditions are met: > + * > + * 1. Redistributions of source code must retain the above copyright notice, > + * this list of conditions and the following disclaimer. > + * > + * 2. Redistributions in binary form must reproduce the above copyright > + * notice, this list of conditions and the following disclaimer in the > + * documentation and/or other materials provided with the distribution. > + * > + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS > + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT > + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS > + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE > + * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, > + * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR > + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, > + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) > + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED > + * OF THE POSSIBILITY OF SUCH DAMAGE. > +*/ > + > +#include <stdlib.h> > +#include <string.h> > +#include <sys/mman.h> > +#include <sys/stat.h> > +#include <sys/fcntl.h> > +#include <stdio.h> > +#include <unistd.h> > +#include "jsmn.h" > +#include "json.h" > +#include <linux/kernel.h> > + > +static char *mapfile(const char *fn, size_t *size) > +{ > + unsigned ps = sysconf(_SC_PAGESIZE); > + struct stat st; > + char *map = NULL; > + int err; > + int fd = open(fn, O_RDONLY); > + > + if (fd < 0) > + return NULL; > + err = fstat(fd, &st); > + if (err < 0) > + goto out; > + *size = st.st_size; > + map = mmap(NULL, > + (st.st_size + ps - 1) & ~(ps -1), > + PROT_READ|PROT_WRITE, MAP_PRIVATE, fd, 0); > + if (map == (char *)MAP_FAILED) > + map = NULL; > +out: > + close(fd); > + return map; > +} > + > +static void unmapfile(char *map, size_t size) > +{ > + unsigned ps = sysconf(_SC_PAGESIZE); > + munmap(map, roundup(size, ps)); > +} > + > +/* > + * Parse json file using jsmn. Return array of tokens, > + * and mapped file. Caller needs to free array. > + */ > +jsmntok_t *parse_json(const char *fn, char **map, size_t *size, int *len) > +{ > + jsmn_parser parser; > + jsmntok_t *tokens; > + jsmnerr_t res; > + unsigned sz; > + > + *map = mapfile(fn, size); > + if (!*map) > + return NULL; > + /* Heuristic */ > + sz = *size * 16; > + tokens = malloc(sz); > + if (!tokens) > + goto error; > + jsmn_init(&parser); > + res = jsmn_parse(&parser, *map, *size, tokens, > + sz / sizeof(jsmntok_t)); > + if (res != JSMN_SUCCESS) { > + pr_err("%s: json error %d\n", fn, res); > + goto error_free; > + } > + if (len) > + *len = parser.toknext; > + return tokens; > +error_free: > + free(tokens); > +error: > + unmapfile(*map, *size); > + return NULL; > +} > + > +void free_json(char *map, size_t size, jsmntok_t *tokens) > +{ > + free(tokens); > + unmapfile(map, size); > +} > + > +static int countchar(char *map, char c, int end) > +{ > + int i; > + int count = 0; > + for (i = 0; i < end; i++) > + if (map[i] == c) > + count++; > + return count; > +} > + > +/* Return line number of a jsmn token */ > +int json_line(char *map, jsmntok_t *t) > +{ > + return countchar(map, '\n', t->start) + 1; > +} > + > +static const char *jsmn_types[] = { > + [JSMN_PRIMITIVE] = "primitive", > + [JSMN_ARRAY] = "array", > + [JSMN_OBJECT] = "object", > + [JSMN_STRING] = "string" > +}; > + > +#define LOOKUP(a, i) ((i) < (sizeof(a)/sizeof(*(a))) ? ((a)[i]) : "?") > + > +/* Return type name of a jsmn token */ > +const char *json_name(jsmntok_t *t) > +{ > + return LOOKUP(jsmn_types, t->type); > +} > + > +int json_len(jsmntok_t *t) > +{ > + return t->end - t->start; > +} > + > +/* Is string t equal to s? */ > +int json_streq(char *map, jsmntok_t *t, const char *s) > +{ > + unsigned len = t->end - t->start; > + return len == strlen(s) && !strncasecmp(map + t->start, s, len); > +} > diff --git a/tools/perf/util/json.h b/tools/perf/util/json.h > new file mode 100644 > index 0000000..37dd9e9 > --- /dev/null > +++ b/tools/perf/util/json.h > @@ -0,0 +1,13 @@ > +#ifndef JSON_H > +#define JSON_H 1 > + > +#include "jsmn.h" > + > +jsmntok_t *parse_json(const char *fn, char **map, size_t *size, int *len); > +void free_json(char *map, size_t size, jsmntok_t *tokens); > +int json_line(char *map, jsmntok_t *t); > +const char *json_name(jsmntok_t *t); > +int json_streq(char *map, jsmntok_t *t, const char *s); > +int json_len(jsmntok_t *t); > + > +#endif > -- > 1.8.5.3 > ^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH 01/10] perf, tools: Add jsmn `jasmine' JSON parser 2014-04-25 13:17 ` Jiri Olsa @ 2014-04-25 15:07 ` Andi Kleen 0 siblings, 0 replies; 23+ messages in thread From: Andi Kleen @ 2014-04-25 15:07 UTC (permalink / raw) To: Jiri Olsa; +Cc: Andi Kleen, acme, linux-kernel, namhyung On Fri, Apr 25, 2014 at 03:17:35PM +0200, Jiri Olsa wrote: > hi, > I guess this is v3 for: > perf: Add support for full Intel event lists v2 > > right? I did not get the 0/10.. is it just rebase? > > also 3/10 seems not finished: > [PATCH 03/10] fixup! perf, tools: Add support for text descriptions of events and alias add I'll repost. -Andi ^ permalink raw reply [flat|nested] 23+ messages in thread
* perf: Add support for full Intel event lists v2
@ 2014-03-14 21:31 Andi Kleen
2014-03-14 21:31 ` [PATCH 01/10] perf, tools: Add jsmn `jasmine' JSON parser Andi Kleen
0 siblings, 1 reply; 23+ messages in thread
From: Andi Kleen @ 2014-03-14 21:31 UTC (permalink / raw)
To: acme; +Cc: mingo, linux-kernel, peterz, eranian, namhyung, jolsa
[v2: Review feedback addressed and some minor improvements]
perf has high level events which are useful in many cases. However
there are some tuning situations where low level events in the CPU
are needed. Traditionally this required specifying the event in
raw form (very awkward) or using non standard frontends
like ocperf or patching in libpfm.
Intel CPUs can have very large event files (Haswell has ~336 core events,
much more if you add uncore or all the offcore combinations), which is too
large to describe through the kernel interface. It would require tying up
significant amounts of unswappable memory for this.
oprofile always had separate event list files that were maintained by
the CPU vendors. The oprofile events were shipped with the tool.
The Intel events get updated regularly, for example to add references
to the specification updates or add new events.
Unfortunately oprofile usually did not keep up with these updates,
so the events in oprofile were often out of date. In addition
it ties up quite a bit of disk space, mostly for CPUs you don't have.
This patch kit implements another mechanism that avoids these problems.
Intel releases the event lists for CPUs in a standardized JSON format
on a download server.
I implemented an automatic downloader to get the event file for the
current CPU. The events are stored in ~/.events.
Then perf adds a parser that converts the JSON format into perf event
aliases, which then can be used directly as any other perf event.
The parsing is done using a simple existing JSON library.
The events are still abstracted for perf, but the abstraction mechanism is
through the downloaded file instead of through the kernel.
The JSON format and perf parser has some minor Intelisms, but they
are simple and small and optional. It's easy to extend, so it would be
possible to use it for other CPUs too, add different pmu attributes, and
add new download sites to the downloader tool.
Currently only core events are supported, uncore may come at a later
point. No kernel changes, all code in perf user tools only.
Some of the parser files are partially shared with separate event parser
library and are thus 2-clause BSD licensed.
Patches also available from
git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-misc perf/json
Example output:
% perf download
Downloading models file
Downloading readme.txt
2014-03-05 10:39:33 URL:https://download.01.org/perfmon/readme.txt [10320/10320] -> "readme.txt" [1]
2014-03-05 10:39:34 URL:https://download.01.org/perfmon/mapfile.csv [1207/1207] -> "mapfile.csv" [1]
Downloading events file
% perf list
...
br_inst_exec.all_branches [Speculative and retired
branches]
br_inst_exec.all_conditional [Speculative and retired
macro-conditional
branches]
br_inst_exec.all_direct_jmp [Speculative and retired
macro-unconditional
branches excluding
calls and indirects]
... 333 more new events ...
% perf stat -e br_inst_exec.all_direct_jmp true
Performance counter stats for 'true':
6,817 cpu/br_inst_exec.all_direct_jmp/
0.003503212 seconds time elapsed
One nice feature is that a pointer to the specification update is now
included in the description, which will hopefully clear up many problems:
% perf list
...
mem_load_uops_l3_hit_retired.xsnp_hit [Retired load uops which
data sources were L3
and cross-core snoop
hits in on-pkg core
cache. Supports address
when precise. Spec
update: HSM26, HSM30
(Precise event)]
...
-Andi
^ permalink raw reply [flat|nested] 23+ messages in thread* [PATCH 01/10] perf, tools: Add jsmn `jasmine' JSON parser 2014-03-14 21:31 perf: Add support for full Intel event lists v2 Andi Kleen @ 2014-03-14 21:31 ` Andi Kleen 2014-03-14 22:41 ` David Ahern 0 siblings, 1 reply; 23+ messages in thread From: Andi Kleen @ 2014-03-14 21:31 UTC (permalink / raw) To: acme; +Cc: mingo, linux-kernel, peterz, eranian, namhyung, jolsa, Andi Kleen From: Andi Kleen <ak@linux.intel.com> I need a JSON parser. This adds the simplest JSON parser I could find -- Serge Zaitsev's jsmn `jasmine' -- to the perf library. I merely converted it to (mostly) Linux style and added support for non 0 terminated input. The parser is quite straight forward and does not copy any data, just returns tokens with offsets into the input buffer. So it's relatively efficient and simple to use. The code is not fully checkpatch clean, but I didn't want to completely fork the upstream code. Original source: http://zserge.bitbucket.org/jsmn.html In addition I added a simple wrapper that mmaps a json file and provides some straight forward access functions. Used in follow-on patches to parse event files. Signed-off-by: Andi Kleen <ak@linux.intel.com> --- tools/perf/Makefile.perf | 4 + tools/perf/util/jsmn.c | 297 +++++++++++++++++++++++++++++++++++++++++++++++ tools/perf/util/jsmn.h | 65 +++++++++++ tools/perf/util/json.c | 155 +++++++++++++++++++++++++ tools/perf/util/json.h | 13 +++ 5 files changed, 534 insertions(+) create mode 100644 tools/perf/util/jsmn.c create mode 100644 tools/perf/util/jsmn.h create mode 100644 tools/perf/util/json.c create mode 100644 tools/perf/util/json.h diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index 1f7ec48..70e6e5a 100644 --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf @@ -301,6 +301,8 @@ LIB_H += ui/progress.h LIB_H += ui/util.h LIB_H += ui/ui.h LIB_H += util/data.h +LIB_H += util/jsmn.h +LIB_H += util/json.h LIB_OBJS += $(OUTPUT)util/abspath.o LIB_OBJS += $(OUTPUT)util/alias.o @@ -374,6 +376,8 @@ LIB_OBJS += $(OUTPUT)util/stat.o LIB_OBJS += $(OUTPUT)util/record.o LIB_OBJS += $(OUTPUT)util/srcline.o LIB_OBJS += $(OUTPUT)util/data.o +LIB_OBJS += $(OUTPUT)util/jsmn.o +LIB_OBJS += $(OUTPUT)util/json.o LIB_OBJS += $(OUTPUT)ui/setup.o LIB_OBJS += $(OUTPUT)ui/helpline.o diff --git a/tools/perf/util/jsmn.c b/tools/perf/util/jsmn.c new file mode 100644 index 0000000..3e4b711 --- /dev/null +++ b/tools/perf/util/jsmn.c @@ -0,0 +1,297 @@ +/* + * Copyright (c) 2010 Serge A. Zaitsev + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + * + * Slightly modified by AK to not assume 0 terminated input. + */ + +#include <stdlib.h> +#include "jsmn.h" + +/* + * Allocates a fresh unused token from the token pull. + */ +static jsmntok_t *jsmn_alloc_token(jsmn_parser *parser, + jsmntok_t *tokens, size_t num_tokens) +{ + jsmntok_t *tok; + + if ((unsigned)parser->toknext >= num_tokens) + return NULL; + tok = &tokens[parser->toknext++]; + tok->start = tok->end = -1; + tok->size = 0; + return tok; +} + +/* + * Fills token type and boundaries. + */ +static void jsmn_fill_token(jsmntok_t *token, jsmntype_t type, + int start, int end) +{ + token->type = type; + token->start = start; + token->end = end; + token->size = 0; +} + +/* + * Fills next available token with JSON primitive. + */ +static jsmnerr_t jsmn_parse_primitive(jsmn_parser *parser, const char *js, + size_t len, + jsmntok_t *tokens, size_t num_tokens) +{ + jsmntok_t *token; + int start; + + start = parser->pos; + + for (; parser->pos < len; parser->pos++) { + switch (js[parser->pos]) { +#ifndef JSMN_STRICT + /* + * In strict mode primitive must be followed by "," + * or "}" or "]" + */ + case ':': +#endif + case '\t': + case '\r': + case '\n': + case ' ': + case ',': + case ']': + case '}': + goto found; + default: + break; + } + if (js[parser->pos] < 32 || js[parser->pos] >= 127) { + parser->pos = start; + return JSMN_ERROR_INVAL; + } + } +#ifdef JSMN_STRICT + /* + * In strict mode primitive must be followed by a + * comma/object/array. + */ + parser->pos = start; + return JSMN_ERROR_PART; +#endif + +found: + token = jsmn_alloc_token(parser, tokens, num_tokens); + if (token == NULL) { + parser->pos = start; + return JSMN_ERROR_NOMEM; + } + jsmn_fill_token(token, JSMN_PRIMITIVE, start, parser->pos); + parser->pos--; + return JSMN_SUCCESS; +} + +/* + * Fills next token with JSON string. + */ +static jsmnerr_t jsmn_parse_string(jsmn_parser *parser, const char *js, + size_t len, + jsmntok_t *tokens, size_t num_tokens) +{ + jsmntok_t *token; + int start = parser->pos; + + parser->pos++; + + /* Skip starting quote */ + for (; parser->pos < len; parser->pos++) { + char c = js[parser->pos]; + + /* Quote: end of string */ + if (c == '\"') { + token = jsmn_alloc_token(parser, tokens, num_tokens); + if (token == NULL) { + parser->pos = start; + return JSMN_ERROR_NOMEM; + } + jsmn_fill_token(token, JSMN_STRING, start+1, + parser->pos); + return JSMN_SUCCESS; + } + + /* Backslash: Quoted symbol expected */ + if (c == '\\') { + parser->pos++; + switch (js[parser->pos]) { + /* Allowed escaped symbols */ + case '\"': + case '/': + case '\\': + case 'b': + case 'f': + case 'r': + case 'n': + case 't': + break; + /* Allows escaped symbol \uXXXX */ + case 'u': + /* TODO */ + break; + /* Unexpected symbol */ + default: + parser->pos = start; + return JSMN_ERROR_INVAL; + } + } + } + parser->pos = start; + return JSMN_ERROR_PART; +} + +/* + * Parse JSON string and fill tokens. + */ +jsmnerr_t jsmn_parse(jsmn_parser *parser, const char *js, size_t len, + jsmntok_t *tokens, + unsigned int num_tokens) +{ + jsmnerr_t r; + int i; + jsmntok_t *token; + + for (; parser->pos < len; parser->pos++) { + char c; + jsmntype_t type; + + c = js[parser->pos]; + switch (c) { + case '{': + case '[': + token = jsmn_alloc_token(parser, tokens, num_tokens); + if (token == NULL) + return JSMN_ERROR_NOMEM; + if (parser->toksuper != -1) + tokens[parser->toksuper].size++; + token->type = (c == '{' ? JSMN_OBJECT : JSMN_ARRAY); + token->start = parser->pos; + parser->toksuper = parser->toknext - 1; + break; + case '}': + case ']': + type = (c == '}' ? JSMN_OBJECT : JSMN_ARRAY); + for (i = parser->toknext - 1; i >= 0; i--) { + token = &tokens[i]; + if (token->start != -1 && token->end == -1) { + if (token->type != type) + return JSMN_ERROR_INVAL; + parser->toksuper = -1; + token->end = parser->pos + 1; + break; + } + } + /* Error if unmatched closing bracket */ + if (i == -1) + return JSMN_ERROR_INVAL; + for (; i >= 0; i--) { + token = &tokens[i]; + if (token->start != -1 && token->end == -1) { + parser->toksuper = i; + break; + } + } + break; + case '\"': + r = jsmn_parse_string(parser, js, len, tokens, + num_tokens); + if (r < 0) + return r; + if (parser->toksuper != -1) + tokens[parser->toksuper].size++; + break; + case '\t': + case '\r': + case '\n': + case ':': + case ',': + case ' ': + break; +#ifdef JSMN_STRICT + /* + * In strict mode primitives are: + * numbers and booleans. + */ + case '-': + case '0': + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': + case '8': + case '9': + case 't': + case 'f': + case 'n': +#else + /* + * In non-strict mode every unquoted value + * is a primitive. + */ + default: +#endif + r = jsmn_parse_primitive(parser, js, len, tokens, + num_tokens); + if (r < 0) + return r; + if (parser->toksuper != -1) + tokens[parser->toksuper].size++; + break; + +#ifdef JSMN_STRICT + /* Unexpected char in strict mode */ + default: + return JSMN_ERROR_INVAL; +#endif + } + } + + for (i = parser->toknext - 1; i >= 0; i--) { + /* Unmatched opened object or array */ + if (tokens[i].start != -1 && tokens[i].end == -1) + return JSMN_ERROR_PART; + } + + return JSMN_SUCCESS; +} + +/* + * Creates a new parser based over a given buffer with an array of tokens + * available. + */ +void jsmn_init(jsmn_parser *parser) +{ + parser->pos = 0; + parser->toknext = 0; + parser->toksuper = -1; +} diff --git a/tools/perf/util/jsmn.h b/tools/perf/util/jsmn.h new file mode 100644 index 0000000..8f432b0 --- /dev/null +++ b/tools/perf/util/jsmn.h @@ -0,0 +1,65 @@ +#ifndef __JSMN_H_ +#define __JSMN_H_ + +/* + * JSON type identifier. Basic types are: + * o Object + * o Array + * o String + * o Other primitive: number, boolean (true/false) or null + */ +typedef enum { + JSMN_PRIMITIVE = 0, + JSMN_OBJECT = 1, + JSMN_ARRAY = 2, + JSMN_STRING = 3 +} jsmntype_t; + +typedef enum { + /* Not enough tokens were provided */ + JSMN_ERROR_NOMEM = -1, + /* Invalid character inside JSON string */ + JSMN_ERROR_INVAL = -2, + /* The string is not a full JSON packet, more bytes expected */ + JSMN_ERROR_PART = -3, + /* Everything was fine */ + JSMN_SUCCESS = 0 +} jsmnerr_t; + +/* + * JSON token description. + * @param type type (object, array, string etc.) + * @param start start position in JSON data string + * @param end end position in JSON data string + */ +typedef struct { + jsmntype_t type; + int start; + int end; + int size; +} jsmntok_t; + +/* + * JSON parser. Contains an array of token blocks available. Also stores + * the string being parsed now and current position in that string + */ +typedef struct { + unsigned int pos; /* offset in the JSON string */ + int toknext; /* next token to allocate */ + int toksuper; /* superior token node, e.g parent object or array */ +} jsmn_parser; + +/* + * Create JSON parser over an array of tokens + */ +void jsmn_init(jsmn_parser *parser); + +/* + * Run JSON parser. It parses a JSON data string into and array of tokens, + * each describing a single JSON object. + */ +jsmnerr_t jsmn_parse(jsmn_parser *parser, const char *js, + size_t len, + jsmntok_t *tokens, unsigned int num_tokens); + +#endif /* __JSMN_H_ */ diff --git a/tools/perf/util/json.c b/tools/perf/util/json.c new file mode 100644 index 0000000..e505da9 --- /dev/null +++ b/tools/perf/util/json.c @@ -0,0 +1,155 @@ +/* Parse JSON files using the JSMN parser. */ + +/* + * Copyright (c) 2014, Intel Corporation + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, + * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED + * OF THE POSSIBILITY OF SUCH DAMAGE. +*/ + +#include <stdlib.h> +#include <string.h> +#include <sys/mman.h> +#include <sys/stat.h> +#include <sys/fcntl.h> +#include <stdio.h> +#include <unistd.h> +#include "jsmn.h" +#include "json.h" +#include <linux/kernel.h> + +static char *mapfile(const char *fn, size_t *size) +{ + unsigned ps = sysconf(_SC_PAGESIZE); + struct stat st; + char *map = NULL; + int err; + int fd = open(fn, O_RDONLY); + + if (fd < 0) + return NULL; + err = fstat(fd, &st); + if (err < 0) + goto out; + *size = st.st_size; + map = mmap(NULL, + (st.st_size + ps - 1) & ~(ps -1), + PROT_READ|PROT_WRITE, MAP_PRIVATE, fd, 0); + if (map == (char *)MAP_FAILED) + map = NULL; +out: + close(fd); + return map; +} + +static void unmapfile(char *map, size_t size) +{ + unsigned ps = sysconf(_SC_PAGESIZE); + munmap(map, roundup(size, ps)); +} + +/* + * Parse json file using jsmn. Return array of tokens, + * and mapped file. Caller needs to free array. + */ +jsmntok_t *parse_json(const char *fn, char **map, size_t *size, int *len) +{ + jsmn_parser parser; + jsmntok_t *tokens; + jsmnerr_t res; + unsigned sz; + + *map = mapfile(fn, size); + if (!*map) + return NULL; + /* Heuristic */ + sz = *size * 16; + tokens = malloc(sz); + if (!tokens) + goto error; + jsmn_init(&parser); + res = jsmn_parse(&parser, *map, *size, tokens, + sz / sizeof(jsmntok_t)); + if (res != JSMN_SUCCESS) { + pr_err("%s: json error %d\n", fn, res); + goto error_free; + } + if (len) + *len = parser.toknext; + return tokens; +error_free: + free(tokens); +error: + unmapfile(*map, *size); + return NULL; +} + +void free_json(char *map, size_t size, jsmntok_t *tokens) +{ + free(tokens); + unmapfile(map, size); +} + +static int countchar(char *map, char c, int end) +{ + int i; + int count = 0; + for (i = 0; i < end; i++) + if (map[i] == c) + count++; + return count; +} + +/* Return line number of a jsmn token */ +int json_line(char *map, jsmntok_t *t) +{ + return countchar(map, '\n', t->start) + 1; +} + +static const char *jsmn_types[] = { + [JSMN_PRIMITIVE] = "primitive", + [JSMN_ARRAY] = "array", + [JSMN_OBJECT] = "object", + [JSMN_STRING] = "string" +}; + +#define LOOKUP(a, i) ((i) < (sizeof(a)/sizeof(*(a))) ? ((a)[i]) : "?") + +/* Return type name of a jsmn token */ +const char *json_name(jsmntok_t *t) +{ + return LOOKUP(jsmn_types, t->type); +} + +int json_len(jsmntok_t *t) +{ + return t->end - t->start; +} + +/* Is string t equal to s? */ +int json_streq(char *map, jsmntok_t *t, const char *s) +{ + unsigned len = t->end - t->start; + return len == strlen(s) && !strncasecmp(map + t->start, s, len); +} diff --git a/tools/perf/util/json.h b/tools/perf/util/json.h new file mode 100644 index 0000000..37dd9e9 --- /dev/null +++ b/tools/perf/util/json.h @@ -0,0 +1,13 @@ +#ifndef JSON_H +#define JSON_H 1 + +#include "jsmn.h" + +jsmntok_t *parse_json(const char *fn, char **map, size_t *size, int *len); +void free_json(char *map, size_t size, jsmntok_t *tokens); +int json_line(char *map, jsmntok_t *t); +const char *json_name(jsmntok_t *t); +int json_streq(char *map, jsmntok_t *t, const char *s); +int json_len(jsmntok_t *t); + +#endif -- 1.8.5.3 ^ permalink raw reply related [flat|nested] 23+ messages in thread
* Re: [PATCH 01/10] perf, tools: Add jsmn `jasmine' JSON parser 2014-03-14 21:31 ` [PATCH 01/10] perf, tools: Add jsmn `jasmine' JSON parser Andi Kleen @ 2014-03-14 22:41 ` David Ahern 2014-03-15 2:27 ` Andi Kleen 0 siblings, 1 reply; 23+ messages in thread From: David Ahern @ 2014-03-14 22:41 UTC (permalink / raw) To: Andi Kleen, acme Cc: mingo, linux-kernel, peterz, eranian, namhyung, jolsa, Andi Kleen On 3/14/14, 3:31 PM, Andi Kleen wrote: > @@ -374,6 +376,8 @@ LIB_OBJS += $(OUTPUT)util/stat.o > LIB_OBJS += $(OUTPUT)util/record.o > LIB_OBJS += $(OUTPUT)util/srcline.o > LIB_OBJS += $(OUTPUT)util/data.o > +LIB_OBJS += $(OUTPUT)util/jsmn.o > +LIB_OBJS += $(OUTPUT)util/json.o > > LIB_OBJS += $(OUTPUT)ui/setup.o > LIB_OBJS += $(OUTPUT)ui/helpline.o > CONFIG driven? Allow a user to omit this. David ^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH 01/10] perf, tools: Add jsmn `jasmine' JSON parser 2014-03-14 22:41 ` David Ahern @ 2014-03-15 2:27 ` Andi Kleen 2014-03-15 13:04 ` Arnaldo Carvalho de Melo 2014-03-15 15:46 ` David Ahern 0 siblings, 2 replies; 23+ messages in thread From: Andi Kleen @ 2014-03-15 2:27 UTC (permalink / raw) To: David Ahern Cc: Andi Kleen, acme, mingo, linux-kernel, peterz, eranian, namhyung, jolsa, Andi Kleen On Fri, Mar 14, 2014 at 04:41:31PM -0600, David Ahern wrote: > On 3/14/14, 3:31 PM, Andi Kleen wrote: > >@@ -374,6 +376,8 @@ LIB_OBJS += $(OUTPUT)util/stat.o > > LIB_OBJS += $(OUTPUT)util/record.o > > LIB_OBJS += $(OUTPUT)util/srcline.o > > LIB_OBJS += $(OUTPUT)util/data.o > >+LIB_OBJS += $(OUTPUT)util/jsmn.o > >+LIB_OBJS += $(OUTPUT)util/json.o > > > > LIB_OBJS += $(OUTPUT)ui/setup.o > > LIB_OBJS += $(OUTPUT)ui/helpline.o > > > > CONFIG driven? Allow a user to omit this. Why? It has no external dependencies. AFAIK that's the only reason for configs. (unless you count the commands used by the shell script, but the basic parser works fine even without the script) -Andi ^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH 01/10] perf, tools: Add jsmn `jasmine' JSON parser 2014-03-15 2:27 ` Andi Kleen @ 2014-03-15 13:04 ` Arnaldo Carvalho de Melo 2014-03-15 18:04 ` Andi Kleen 2014-03-15 15:46 ` David Ahern 1 sibling, 1 reply; 23+ messages in thread From: Arnaldo Carvalho de Melo @ 2014-03-15 13:04 UTC (permalink / raw) To: Andi Kleen Cc: David Ahern, mingo, linux-kernel, peterz, eranian, namhyung, jolsa, Andi Kleen Em Sat, Mar 15, 2014 at 03:27:07AM +0100, Andi Kleen escreveu: > On Fri, Mar 14, 2014 at 04:41:31PM -0600, David Ahern wrote: > > On 3/14/14, 3:31 PM, Andi Kleen wrote: > > >@@ -374,6 +376,8 @@ LIB_OBJS += $(OUTPUT)util/stat.o > > > LIB_OBJS += $(OUTPUT)util/record.o > > > LIB_OBJS += $(OUTPUT)util/srcline.o > > > LIB_OBJS += $(OUTPUT)util/data.o > > >+LIB_OBJS += $(OUTPUT)util/jsmn.o > > >+LIB_OBJS += $(OUTPUT)util/json.o > > CONFIG driven? Allow a user to omit this. > Why? It has no external dependencies. AFAIK that's the only reason for configs. > (unless you count the commands used by the shell script, but the basic parser > works fine even without the script) Will this be useful for all arches? - Arnaldo ^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH 01/10] perf, tools: Add jsmn `jasmine' JSON parser 2014-03-15 13:04 ` Arnaldo Carvalho de Melo @ 2014-03-15 18:04 ` Andi Kleen 0 siblings, 0 replies; 23+ messages in thread From: Andi Kleen @ 2014-03-15 18:04 UTC (permalink / raw) To: Arnaldo Carvalho de Melo Cc: Andi Kleen, David Ahern, mingo, linux-kernel, peterz, eranian, namhyung, jolsa, Andi Kleen > Will this be useful for all arches? Yes they could define their own JSON files, perhaps with minor extensions of the parser and a new download sites in the downloader. -Andi ^ permalink raw reply [flat|nested] 23+ messages in thread
* Re: [PATCH 01/10] perf, tools: Add jsmn `jasmine' JSON parser 2014-03-15 2:27 ` Andi Kleen 2014-03-15 13:04 ` Arnaldo Carvalho de Melo @ 2014-03-15 15:46 ` David Ahern 1 sibling, 0 replies; 23+ messages in thread From: David Ahern @ 2014-03-15 15:46 UTC (permalink / raw) To: Andi Kleen Cc: acme, mingo, linux-kernel, peterz, eranian, namhyung, jolsa, Andi Kleen On 3/14/14, 8:27 PM, Andi Kleen wrote: > On Fri, Mar 14, 2014 at 04:41:31PM -0600, David Ahern wrote: >> On 3/14/14, 3:31 PM, Andi Kleen wrote: >>> @@ -374,6 +376,8 @@ LIB_OBJS += $(OUTPUT)util/stat.o >>> LIB_OBJS += $(OUTPUT)util/record.o >>> LIB_OBJS += $(OUTPUT)util/srcline.o >>> LIB_OBJS += $(OUTPUT)util/data.o >>> +LIB_OBJS += $(OUTPUT)util/jsmn.o >>> +LIB_OBJS += $(OUTPUT)util/json.o >>> >>> LIB_OBJS += $(OUTPUT)ui/setup.o >>> LIB_OBJS += $(OUTPUT)ui/helpline.o >>> >> >> CONFIG driven? Allow a user to omit this. > > Why? It has no external dependencies. AFAIK that's the only reason for configs. We have also talked about config driven builds to allow pieces to be omitted -- e.g., to keep binary size down for embedded systems. This is clearly a standalone piece so why not add the config upfront now? David ^ permalink raw reply [flat|nested] 23+ messages in thread
end of thread, other threads:[~2015-05-27 21:27 UTC | newest] Thread overview: 23+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2014-07-30 23:22 perf: Add support for full Intel event lists v8 Andi Kleen 2014-07-30 23:22 ` [PATCH 01/10] perf, tools: Add jsmn `jasmine' JSON parser Andi Kleen 2014-07-30 23:22 ` [PATCH 02/10] perf, tools: Add support for text descriptions of events and alias add Andi Kleen 2014-07-30 23:22 ` [PATCH 03/10] perf, tools, list: Update perf list to output descriptions Andi Kleen 2014-07-30 23:22 ` [PATCH 04/10] perf, tools: Allow events with dot Andi Kleen 2014-07-30 23:22 ` [PATCH 05/10] perf, tools: Add support for reading JSON event files Andi Kleen 2014-07-30 23:22 ` [PATCH 06/10] perf, tools: Automatically look for event file name for cpu Andi Kleen 2014-07-30 23:22 ` [PATCH 07/10] perf, tools: Query terminal width and use in perf list Andi Kleen 2014-07-30 23:22 ` [PATCH 08/10] perf, tools: Add a new pmu interface to iterate over all events Andi Kleen 2014-07-30 23:22 ` [PATCH 09/10] perf, tools, test: Add test case for alias and JSON parsing Andi Kleen 2014-07-30 23:22 ` [PATCH 10/10] perf, tools: Add a --no-desc flag to perf list Andi Kleen 2014-11-24 22:37 ` perf: Add support for full Intel event lists v8 Sukadev Bhattiprolu 2014-11-25 9:33 ` Jiri Olsa -- strict thread matches above, loose matches on Subject: below -- 2015-05-27 21:23 [PATCH 0/10] perf: Add support for PMU events in JSON format Sukadev Bhattiprolu 2015-05-27 21:23 ` [PATCH 01/10] perf, tools: Add jsmn `jasmine' JSON parser Sukadev Bhattiprolu 2014-04-16 18:49 Andi Kleen 2014-04-25 13:17 ` Jiri Olsa 2014-04-25 15:07 ` Andi Kleen 2014-03-14 21:31 perf: Add support for full Intel event lists v2 Andi Kleen 2014-03-14 21:31 ` [PATCH 01/10] perf, tools: Add jsmn `jasmine' JSON parser Andi Kleen 2014-03-14 22:41 ` David Ahern 2014-03-15 2:27 ` Andi Kleen 2014-03-15 13:04 ` Arnaldo Carvalho de Melo 2014-03-15 18:04 ` Andi Kleen 2014-03-15 15:46 ` David Ahern
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).