perf, tools: Add jsmn `jasmine' JSON parser
PATCH 1/10 perf, tools: Add jsmn `jasmine' JSON parser
From: Andi Kleen <[email protected]>
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.
--- 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
tools/perf/Makefile.perf +4 -0
@@ -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
tools/perf/util/jsmn.c new file +297 -0
297 lines not on this page · raw message
tools/perf/util/jsmn.h new file +65 -0
65 lines not on this page · raw message
tools/perf/util/json.c new file +155 -0
155 lines not on this page · raw message
tools/perf/util/json.h new file +13 -0
@@ -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
Signature · 1 line
1.8.5.3
PATCH 2/10 perf, tools: Add support for text descriptions of events and alias add
From: Andi Kleen <[email protected]>
Change pmu.c to allow descriptions of events and add interfaces to add aliases. Used in the next patch.
--- tools/perf/util/pmu.c | 79 +++++++++++++++++++++++++++++++++++---------------- 1 file changed, 54 insertions(+), 25 deletions(-)
tools/perf/util/pmu.c +54 -25
@@ -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.
@@ -734,21 +751,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 &&
@@ -756,22 +776,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)
Signature · 1 line
1.8.5.3
PATCH 3/10 fixup! perf, tools: Add support for text descriptions of events and alias add
In reply to Andi KleenFrom: Andi Kleen <[email protected]>
--- tools/perf/util/pmu.c | 48 ++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 44 insertions(+), 4 deletions(-)
tools/perf/util/pmu.c +44 -4
@@ -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)
Signature · 1 line
1.8.5.3
PATCH 4/10 perf, tools: Add support for reading JSON event files
In reply to Andi KleenFrom: Andi Kleen <[email protected]>
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.
--- tools/perf/Documentation/perf-list.txt | 6 + tools/perf/Documentation/perf-record.txt | 3 + tools/perf/Documentation/perf-stat.txt | 3 + 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 | 248 +++++++++++++++++++++++++++++++ tools/perf/util/jevents.h | 3 + tools/perf/util/pmu.c | 14 ++ tools/perf/util/pmu.h | 2 + 11 files changed, 288 insertions(+) create mode 100644 tools/perf/util/jevents.c create mode 100644 tools/perf/util/jevents.h
tools/perf/Documentation/perf-list.txt +6 -0
@@ -15,6 +15,12 @@ DESCRIPTION This command displays the symbolic event types which can be selected in the various perf commands with the -e option. +OPTIONS +------- +--json-file=:: +Specify JSON event list file to use for parsing events. + + [[EVENT_MODIFIERS]] EVENT MODIFIERS ---------------
tools/perf/Documentation/perf-record.txt +3 -0
@@ -213,6 +213,9 @@ 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. +--json-file=:: +Specify JSON event list file to use for parsing events. + SEE ALSO -------- linkperf:perf-stat[1], linkperf:perf-list[1]
tools/perf/Documentation/perf-stat.txt +3 -0
@@ -142,6 +142,9 @@ filter out the startup phase of the program, which is often very different. Print statistics of transactional execution if supported. +--json-file=:: +Specify JSON event list file to use for parsing events. + EXAMPLES --------
tools/perf/Makefile.perf +2 -0
@@ -303,6 +303,7 @@ LIB_H += ui/ui.h LIB_H += util/data.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
@@ -378,6 +379,7 @@ 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)util/jevents.o LIB_OBJS += $(OUTPUT)ui/setup.o LIB_OBJS += $(OUTPUT)ui/helpline.o
tools/perf/builtin-list.c +2 -0
@@ -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 ,"json-file" , &json_file,"json file" , +"Read event json file" ),OPT_END () };const char *const list_usage[] = {
tools/perf/builtin-record.c +3 -0
@@ -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>
@@ -910,6 +911,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 ,"json-file" , &json_file,"json file" , +"Read event json file" ), OPT_END() };
tools/perf/builtin-stat.c +2 -0
@@ -1661,6 +1661,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 ,"json-file" , &json_file,"json file" , +"Read event json file" ),OPT_END () }; const char * const stat_usage[] = {
tools/perf/util/jevents.c new file +248 -0
248 lines not on this page · raw message
tools/perf/util/jevents.h new file +3 -0
@@ -0,0 +1,3 @@ +int json_events (const char *fn, +int (*func)(void *data,char *name,char *event,char *desc), +void *data);
tools/perf/util/pmu.c +14 -0
@@ -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 ;
tools/perf/util/pmu.h +2 -0
@@ -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 */
Signature · 1 line
1.8.5.3
PATCH 5/10 perf, tools: Automatically look for event file name for cpu v2
In reply to Andi KleenFrom: Andi Kleen <[email protected]>
When no JSON event file is specified automatically look for a suitable file in ~/.cache/pmu-events. A "perf download" can automatically add files there for the current CPUs.
This does not include the actual event files with perf, but they can be automatically downloaded instead (implemented in the next patch)
This has the advantage that the events can be always uptodate, because they are freshly downloaded. In oprofile we always had problems with out of date or incomplete events files.
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
--- tools/perf/arch/x86/Makefile | 1 + tools/perf/arch/x86/util/cpustr.c | 34 ++++++++++++++++++++++++++++++++++ tools/perf/util/jevents.c | 31 +++++++++++++++++++++++++++++++ tools/perf/util/jevents.h | 1 + tools/perf/util/pmu.c | 2 +- 5 files changed, 68 insertions(+), 1 deletion(-) create mode 100644 tools/perf/arch/x86/util/cpustr.c
tools/perf/arch/x86/Makefile +1 -0
@@ -14,4 +14,5 @@ LIB_OBJS += $(OUTPUT)arch/$(ARCH)/tests/dwarf-unwind.o endif LIB_OBJS += $(OUTPUT)arch/$(ARCH)/util/header.o LIB_OBJS += $(OUTPUT)arch/$(ARCH)/util/tsc.o +LIB_OBJS += $(OUTPUT)arch/$(ARCH)/util/cpustr.o LIB_H += arch/$(ARCH)/util/tsc.h
tools/perf/arch/x86/util/cpustr.c new file +34 -0
@@ -0,0 +1,34 @@ +#include <stdio.h> +#include <stdlib.h> +#include "../../util/jevents.h" + +char *get_cpu_str (void ) +{ +char *line =NULL ; +size_t llen =0 ; +int found =0 , n; +char vendor[30 ]; +int model, fam; +char *res =NULL ; +FILE *f =fopen ("/proc/cpuinfo" ,"r" ); + +if (!f) +return NULL ; +while (getline (&line, &llen, f) >0 ) { +if (sscanf (line,"vendor_id : %30s" , vendor) ==1 ) + found++; +else if (sscanf (line,"model : %d" , &model) ==1 ) + found++; +else if (sscanf (line,"cpu family : %d" , &fam) ==1 ) + found++; +if (found ==3 ) { + n =asprintf (&res,"%s-%d-%X-core" , vendor, fam, model); +if (n <0 ) + res =NULL ; +break ; + } + } +free (line); +fclose (f); +return res; +}
tools/perf/util/jevents.c +31 -0
@@ -33,10 +33,39 @@#include <errno.h> #include <string.h> #include <ctype.h> +#include "cache.h" #include "jsmn.h" #include "json.h" #include "jevents.h" +__attribute__((weak))char *get_cpu_str (void ) +{ +return NULL ; +} + +static const char *json_default_name (void ) +{ +char *cache =getenv ("XDG_CACHE_HOME" ); +char *idstr =get_cpu_str (); +char *res =NULL ; +char *home =NULL ; + +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 +200,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 ;
tools/perf/util/jevents.h +1 -0
@@ -1,3 +1,4 @@int json_events (const char *fn,int (*func)(void *data,char *name,char *event,char *desc),void *data); +char *get_cpu_str (void );
tools/perf/util/pmu.c +1 -1
@@ -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))
Signature · 1 line
1.8.5.3
PATCH 6/10 perf, tools: Add perf download to download event files v2
In reply to Andi KleenFrom: Andi Kleen <[email protected]>
Add a downloader to automatically download the right files from a download site.
This is implemented as a script calling wget, similar to perf archive. The perf driver automatically calls the right binary. The downloader is extensible, but currently only implements an Intel event download. It would be straightforward to add other sites too for other vendors.
The downloaded event files are put into ~/.cache/pmu-events, where the builtin event parser in util/* can find them automatically.
--- tools/perf/Documentation/perf-download.txt | 28 ++++++++++++++++ tools/perf/Documentation/perf-list.txt | 12 ++++++- tools/perf/Makefile.perf | 5 ++- tools/perf/perf-download.sh | 52 ++++++++++++++++++++++++++++++ 4 files changed, 95 insertions(+), 2 deletions(-) create mode 100644 tools/perf/Documentation/perf-download.txt create mode 100755 tools/perf/perf-download.sh
tools/perf/Documentation/perf-download.txt new file +28 -0
@@ -0,0 +1,28 @@ +perf-download(1) +=============== + +NAME +---- +perf-download - Download event files for current CPU. + +SYNOPSIS +-------- +[verse] +'perf download' [vendor-family-model] + +DESCRIPTION +----------- +This command automatically downloads event list for the current CPU and +stores them in $XDG_CACHE_HOME/pmu-events (or $HOME/.cache/pmu-events). +The other tools automatically look for them there. The CPU can be also +specified at the command line. + +The downloading is done using http through wget, which needs +to be installed. + +The user should regularly call this to download updated event lists +for the current CPU. + +Note the downloaded files are stored per user, so if you use +perf as normal user or with sudo you have to run perf download +for both or specify --json-file for the users manually.
tools/perf/Documentation/perf-list.txt +11 -1
@@ -61,6 +61,16 @@ Sampling). Examples to use IBS: perf record -a -e r076:p ... # same as -e cpu-cycles:p perf record -a -e r0C1:p ... # use ibs op counting micro-ops +PER CPU EVENT LISTS +------------------- + +For some CPUs (particularly modern Intel CPUs) "perf download" can +download additional CPU specific event definitions, which then +become visible in perf list and available in the other perf tools. + +This obsoletes the raw event description method described below +for most cases. + RAW HARDWARE EVENT DESCRIPTOR ----------------------------- Even when an event is not available in a symbolic form within perf right now,
@@ -123,6 +133,6 @@ types specified. SEE ALSO -------- linkperf:perf-stat[1], linkperf:perf-top[1], -linkperf:perf-record[1], +linkperf:perf-record[1], linkperf:perf-download[1], http://www.intel.com/Assets/PDF/manual/253669.pdf[Intel® 64 and IA-32 Architectures Software Developer's Manual Volume 3B: System Programming Guide], http://support.amd.com/us/Processor_TechDocs/24593_APM_v2.pdf[AMD64 Architecture Programmer’s Manual Volume 2: System Programming]
tools/perf/Makefile.perf +4 -1
@@ -126,6 +126,7 @@ PYRF_OBJS = SCRIPT_SH = SCRIPT_SH += perf-archive.sh +SCRIPT_SH += perf-download.sh grep-libs = $(filter -l%,$(1)) strip-libs = $(filter-out -l%,$(1))
@@ -869,6 +870,8 @@ install-bin: all install-gtk $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)' $(call QUIET_INSTALL, perf-archive) \ $(INSTALL) $(OUTPUT)perf-archive -t '$(DESTDIR_SQ)$(perfexec_instdir_SQ)' + $(call QUIET_INSTALL, perf-download) \ + $(INSTALL) $(OUTPUT)perf-download -t '$(DESTDIR_SQ)$(perfexec_instdir_SQ)' ifndef NO_LIBPERL $(call QUIET_INSTALL, perl-scripts) \ $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/scripts/perl/Perf-Trace-Util/lib/Perf/Trace'; \
@@ -914,7 +917,7 @@ config-clean: @$(MAKE) -C config/feature-checks clean >/dev/null clean: $(LIBTRACEEVENT)-clean $(LIBAPIKFS)-clean config-clean - $(call QUIET_CLEAN, core-objs) $(RM) $(LIB_OBJS) $(BUILTIN_OBJS) $(LIB_FILE) $(OUTPUT)perf-archive $(OUTPUT)perf.o $(LANG_BINDINGS) $(GTK_OBJS) + $(call QUIET_CLEAN, core-objs) $(RM) $(LIB_OBJS) $(BUILTIN_OBJS) $(LIB_FILE) $(OUTPUT)perf-archive $(OUTPUT)/perf-download $(OUTPUT)perf.o $(LANG_BINDINGS) $(GTK_OBJS) $(call QUIET_CLEAN, core-progs) $(RM) $(ALL_PROGRAMS) perf $(call QUIET_CLEAN, core-gen) $(RM) *.spec *.pyc *.pyo */*.pyc */*.pyo $(OUTPUT)common-cmds.h TAGS tags cscope* $(OUTPUT)PERF-VERSION-FILE $(OUTPUT)PERF-CFLAGS $(OUTPUT)PERF-FEATURES $(OUTPUT)util/*-bison* $(OUTPUT)util/*-flex* $(QUIET_SUBDIR0)Documentation $(QUIET_SUBDIR1) clean
tools/perf/perf-download.sh new file +52 -0
52 lines not on this page · raw message
Signature · 1 line
1.8.5.3
PATCH 7/10 perf, tools: Allow events with dot
In reply to Andi KleenFrom: Andi Kleen <[email protected]>
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.
--- tools/perf/util/jevents.c | 9 +-------- tools/perf/util/parse-events.l | 3 +-- 2 files changed, 2 insertions(+), 10 deletions(-)
tools/perf/util/jevents.c +1 -8
@@ -87,15 +87,8 @@ static void addfield(char *map, char **dst, const char *sep,static void fixname (char *s) { -for (; *s; s++) { +for (; *s; s++) *s =tolower (*s); -/* -* Remove '.' for now, until the parser -* can deal with it. -*/ -if (*s =='.' ) - *s ='_' ; - } }static void fixdesc (char *s)
tools/perf/util/parse-events.l +1 -2
@@ -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); }
Signature · 1 line
1.8.5.3
PATCH 8/10 perf, tools: Query terminal width and use in perf list
In reply to Andi KleenFrom: Andi Kleen <[email protected]>
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.
--- 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(-)
tools/perf/util/cache.h +1 -0
@@ -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);
tools/perf/util/pager.c +15 -0
@@ -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 ; +}
tools/perf/util/pmu.c +2 -10
@@ -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 ;
Signature · 1 line
1.8.5.3
PATCH 9/10 perf, tools, test: Add test case for alias and JSON parsing
In reply to Andi KleenFrom: Andi Kleen <[email protected]>
Add a simple test case to perf test that runs perf download and parses all the events. This needs adding an all event iterator to pmu.c
--- tools/perf/Makefile.perf | 1 + tools/perf/tests/aliases.c | 52 +++++++++++++++++++++++++++++++++++++++++ tools/perf/tests/builtin-test.c | 4 ++++ tools/perf/tests/tests.h | 1 + tools/perf/util/pmu.c | 18 ++++++++++++++ tools/perf/util/pmu.h | 2 ++ 6 files changed, 78 insertions(+) create mode 100644 tools/perf/tests/aliases.c
tools/perf/Makefile.perf +1 -0
@@ -416,6 +416,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),x86) LIB_OBJS += $(OUTPUT)tests/dwarf-unwind.o
tools/perf/tests/aliases.c new file +52 -0
52 lines not on this page · raw message
tools/perf/tests/builtin-test.c +4 -0
@@ -115,6 +115,10 @@ static struct test { .desc = "Test parsing with no sample_id_all bit set", .func = test__parse_no_sample_id_all, }, + { + .desc = "Test parsing JSON aliases", + .func = test__aliases, + }, #if defined(__x86_64__) || defined(__i386__) #ifdef HAVE_DWARF_UNWIND_SUPPORT {
tools/perf/tests/tests.h +1 -0
@@ -41,6 +41,7 @@ int test__sample_parsing(void);int test__keep_tracking (void );int test__parse_no_sample_id_all (void );int test__dwarf_unwind (void ); +int test__aliases (void );#if defined(__x86_64__) || defined(__i386__)#ifdef HAVE_DWARF_UNWIND_SUPPORT
tools/perf/util/pmu.c +18 -0
@@ -869,3 +869,21 @@ bool pmu_have_event(const char *pname, const char *name) }return false; } + +int pmu_iterate_events (int (*func)(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 (alias->name); +if (ret !=0 ) +break ; + } + } +return ret; +}
tools/perf/util/pmu.h +2 -0
@@ -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 *name)); +extern const char *json_file;#endif /* __PMU_H */
Signature · 1 line
1.8.5.3
PATCH 10/10 perf, tools, record: Always allow to overide default period v2
In reply to Andi KleenFrom: Andi Kleen <[email protected]>
Fix the logic to allow overriding event default periods with -c or -F on the command line. I'm not sure I understand this if() fully, but this change makes all cases I tested work (tracepoint with default, default, ,-c, -F)
This fixed specifying -c / -F with json event list events, which have a default period. It should do the same for trace point events.
Cc: [email protected]
v2: Simplify, just change || to &&
--- tools/perf/util/evsel.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/util/evsel.c +1 -1
@@ -592,7 +592,7 @@ void perf_evsel__config(struct perf_evsel *evsel, struct record_opts *opts)* We default some events to a 1 default interval. But keep * it a weak assumption overridable by the user. */ -if (!attr->sample_period || (opts->user_freq !=UINT_MAX && +if (!attr->sample_period && (opts->user_freq !=UINT_MAX && opts->user_interval !=ULLONG_MAX )) {if (opts->freq) {perf_evsel__set_sample_bit (evsel,PERIOD );
Signature · 1 line
1.8.5.3
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
Quoted 614 lines · Andi Kleen
From: Andi Kleen <[email protected]>
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 <[email protected]>--- 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.htools/perf/Makefile.perf +4
-0@@ -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.otools/perf/util/jsmn.c new file +297
-0@@ -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 ; +}tools/perf/util/jsmn.h new file +65
-0@@ -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_ */ tools/perf/util/json.c new file +155
-0@@ -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); +}tools/perf/util/json.h new file +13
-0@@ -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 Signature · 1 line
1.8.5.3
Quoted 8 lines · Jiri Olsa
hi,
I guess this is v3 for:
perf: Add support for full Intel event lists v2right? 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