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

Commit fb226ccd authored by Masami Hiramatsu's avatar Masami Hiramatsu Committed by Arnaldo Carvalho de Melo
Browse files

perf probe: Show in what binaries/modules probes are set 



Show the name of binary file or modules in which the probes are set with
--list option.

Without this change;

  # ./perf probe -m drm drm_av_sync_delay
  # ./perf probe -x perf dso__load_vmlinux

  # ./perf probe -l
    probe:drm_av_sync_delay (on drm_av_sync_delay)
    probe_perf:dso__load_vmlinux (on 0x000000000006d110)

With this change;

  # ./perf probe -l
    probe:drm_av_sync_delay (on drm_av_sync_delay in drm)
    probe_perf:dso__load_vmlinux (on 0x000000000006d110 in /kbuild/ksrc/linux-3/tools/perf/perf)

Signed-off-by: default avatarMasami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: "David A. Long" <dave.long@linaro.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: yrl.pp-manager.tt@hitachi.com
Link: http://lkml.kernel.org/r/20140206053213.29635.69948.stgit@kbuild-fedora.yrl.intra.hitachi.co.jp


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

tools/perf/util/probe-event.c

+7 −3
Original line number Diff line number Diff line
@@ -1728,7 +1728,8 @@ static struct strlist *get_probe_trace_command_rawlist(int fd) 
}



/* Show an event */

static int show_perf_probe_event(struct perf_probe_event *pev)

static int show_perf_probe_event(struct perf_probe_event *pev,

				 const char *module)

{

	int i, ret;

	char buf[128];
@@ -1744,6 +1745,8 @@ static int show_perf_probe_event(struct perf_probe_event *pev) 
		return ret;



	printf("  %-20s (on %s", buf, place);

	if (module)

		printf(" in %s", module);



	if (pev->nargs > 0) {

		printf(" with");
@@ -1781,7 +1784,8 @@ static int __show_perf_probe_events(int fd, bool is_kprobe) 
			ret = convert_to_perf_probe_event(&tev, &pev,

								is_kprobe);

			if (ret >= 0)

				ret = show_perf_probe_event(&pev);

				ret = show_perf_probe_event(&pev,

							    tev.point.module);

		}

		clear_perf_probe_event(&pev);

		clear_probe_trace_event(&tev);
@@ -1980,7 +1984,7 @@ static int __add_probe_trace_events(struct perf_probe_event *pev, 
		group = pev->group;

		pev->event = tev->event;

		pev->group = tev->group;

		show_perf_probe_event(pev);

		show_perf_probe_event(pev, tev->point.module);

		/* Trick here - restore current event/group */

		pev->event = (char *)event;

		pev->group = (char *)group;