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

Commit 02469a95 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'perf-core-for-mingo-20160615' of... 

Merge tag 'perf-core-for-mingo-20160615' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux

 into perf/core

Pull perf/core improvements and fixes from Arnaldo Carvalho de Melo:

User visible changes:

- Add --ldlat option to 'perf mem' to specify load latency for loads
  event (e.g. cpu/mem-loads/ ) (Jiri Olsa)

Build fixes:

- Fix libunwind related compile error for static cross build (He Kuang)

Infrastructure changes:

- UI refactorings to support headers with multiple lines, non-evsel
  hists browsers, toggle showing callchains, etc (Jiri Olsa)

- More prep work for caching probe definitions, paving the way
  for supporting SDT (Statically Defined Traces) userspace probes (Masami Hiramatsu)

- Handle NULL at perf_config_set__delete() (Taeung Song)

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 2c95afc1 2fd457a3

tools/perf/Documentation/perf-mem.txt

+3 −0
Original line number Diff line number Diff line
@@ -56,6 +56,9 @@ OPTIONS 
--all-user::

	Configure all used events to run in user space.



--ldload::

	Specify desired latency for loads event.



SEE ALSO

--------

linkperf:perf-record[1], linkperf:perf-report[1]

tools/perf/Documentation/perf-probe.txt

+4 −0
Original line number Diff line number Diff line
@@ -109,6 +109,10 @@ OPTIONS 
	Dry run. With this option, --add and --del doesn't execute actual

	adding and removal operations.



--cache::

	Cache the probes (with --add option). Any events which successfully added

	are also stored in the cache file.



--max-probes=NUM::

	Set the maximum number of probe points for an event. Default is 128.

tools/perf/builtin-diff.c

+4 −3
Original line number Diff line number Diff line
@@ -666,7 +666,8 @@ static void hists__process(struct hists *hists) 
	hists__precompute(hists);

	hists__output_resort(hists, NULL);



	hists__fprintf(hists, true, 0, 0, 0, stdout);

	hists__fprintf(hists, true, 0, 0, 0, stdout,

		       symbol_conf.use_callchain);

}



static void data__fprintf(void)
@@ -1044,7 +1045,7 @@ static int hpp__entry_global(struct perf_hpp_fmt *_fmt, struct perf_hpp *hpp, 
}



static int hpp__header(struct perf_hpp_fmt *fmt, struct perf_hpp *hpp,

		       struct perf_evsel *evsel __maybe_unused)

		       struct hists *hists __maybe_unused)

{

	struct diff_hpp_fmt *dfmt =

		container_of(fmt, struct diff_hpp_fmt, fmt);
@@ -1055,7 +1056,7 @@ static int hpp__header(struct perf_hpp_fmt *fmt, struct perf_hpp *hpp, 


static int hpp__width(struct perf_hpp_fmt *fmt,

		      struct perf_hpp *hpp __maybe_unused,

		      struct perf_evsel *evsel __maybe_unused)

		      struct hists *hists __maybe_unused)

{

	struct diff_hpp_fmt *dfmt =

		container_of(fmt, struct diff_hpp_fmt, fmt);

tools/perf/builtin-mem.c

+1 −0
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ static int __cmd_record(int argc, const char **argv, struct perf_mem *mem) 
	OPT_CALLBACK('e', "event", &mem, "event",

		     "event selector. use 'perf mem record -e list' to list available events",

		     parse_record_events),

	OPT_UINTEGER(0, "ldlat", &perf_mem_events__loads_ldlat, "mem-loads latency"),

	OPT_INCR('v', "verbose", &verbose,

		 "be more verbose (show counter open errors, etc)"),

	OPT_BOOLEAN('U', "--all-user", &all_user, "collect only user level data"),

tools/perf/builtin-probe.c

+1 −0
Original line number Diff line number Diff line
@@ -512,6 +512,7 @@ __cmd_probe(int argc, const char **argv, const char *prefix __maybe_unused) 
		    "Enable symbol demangling"),

	OPT_BOOLEAN(0, "demangle-kernel", &symbol_conf.demangle_kernel,

		    "Enable kernel symbol demangling"),

	OPT_BOOLEAN(0, "cache", &probe_conf.cache, "Manipulate probe cache"),

	OPT_END()

	};

	int ret;