Commit 529b3ca8 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'perf/urgent' of... 

Merge branch 'perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux

 into perf/urgent

Pull perf tooling fixes from Arnaldo Carvalho de Melo.

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents ca916599 33974a41

tools/perf/builtin-trace.c

+10 −0
Original line number Diff line number Diff line
@@ -1138,6 +1138,14 @@ static int trace__symbols_init(struct trace *trace, struct perf_evlist *evlist) 
	return err;

}



static void trace__symbols__exit(struct trace *trace)

{

	machine__exit(trace->host);

	trace->host = NULL;



	symbol__exit();

}



static int syscall__alloc_arg_fmts(struct syscall *sc, int nr_args)

{

	int idx;
@@ -2481,6 +2489,8 @@ static int trace__run(struct trace *trace, int argc, const char **argv) 
	}



out_delete_evlist:

	trace__symbols__exit(trace);



	perf_evlist__delete(evlist);

	trace->evlist = NULL;

	trace->live = false;

tools/perf/util/parse-events.l

+3 −2
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
%option stack

%option bison-locations

%option yylineno

%option reject



%{

#include <errno.h>
@@ -339,8 +340,8 @@ r{num_raw_hex} { return raw(yyscanner); } 
{num_hex}		{ return value(yyscanner, 16); }



{modifier_event}	{ return str(yyscanner, PE_MODIFIER_EVENT); }

{bpf_object}		{ if (!isbpf(yyscanner)) USER_REJECT; return str(yyscanner, PE_BPF_OBJECT); }

{bpf_source}		{ if (!isbpf(yyscanner)) USER_REJECT; return str(yyscanner, PE_BPF_SOURCE); }

{bpf_object}		{ if (!isbpf(yyscanner)) { USER_REJECT }; return str(yyscanner, PE_BPF_OBJECT); }

{bpf_source}		{ if (!isbpf(yyscanner)) { USER_REJECT }; return str(yyscanner, PE_BPF_SOURCE); }

{name}			{ return pmu_str_check(yyscanner); }

"/"			{ BEGIN(config); return '/'; }

-			{ return '-'; }