mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Naohiro Aota <naota@elisp.net>
To: Peter Zijlstra <a.p.zijlstra@chello.nl>,
	Arnaldo Carvalho de Melo <acme@kernel.org>,
	Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>,
	Namhyung Kim <namhyung@kernel.org>
Cc: linux-kernel@vger.kernel.org, Naohiro Aota <naota@elisp.net>
Subject: [PATCH 2/2] perf probe: Find compilation directory path for lazy matching
Date: Thu, 26 Feb 2015 16:12:49 +0900	[thread overview]
Message-ID: <1424934769-19481-2-git-send-email-naota@elisp.net> (raw)
In-Reply-To: <1424934769-19481-1-git-send-email-naota@elisp.net>

If we use lazy matching, it failed to open a souce file if perf command
is invoked outside of compilation directory:

$ perf probe -a '__schedule;clear_*'
Failed to open kernel/sched/core.c: No such file or directory
  Error: Failed to add events. (-2)

OTOH, other commands like "probe -L" can solve the souce directory by
themselves. Let's make it possible for lazy matching too!

Signed-off-by: Naohiro Aota <naota@elisp.net>
---
 tools/perf/util/probe-finder.c | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/tools/perf/util/probe-finder.c b/tools/perf/util/probe-finder.c
index b5247d7..8e0714c 100644
--- a/tools/perf/util/probe-finder.c
+++ b/tools/perf/util/probe-finder.c
@@ -39,6 +39,7 @@
 #include "util.h"
 #include "symbol.h"
 #include "probe-finder.h"
+#include "probe-event.h"
 
 /* Kprobe tracer basic type is up to u64 */
 #define MAX_BASIC_TYPE_BITS	64
@@ -849,11 +850,23 @@ static int probe_point_lazy_walker(const char *fname, int lineno,
 static int find_probe_point_lazy(Dwarf_Die *sp_die, struct probe_finder *pf)
 {
 	int ret = 0;
+	char *fpath;
 
 	if (intlist__empty(pf->lcache)) {
+		const char *comp_dir;
+
+		comp_dir = cu_get_comp_dir(&pf->cu_die);
+		ret = get_real_path(pf->fname, comp_dir, &fpath);
+		if (ret < 0) {
+			free(fpath);
+			pr_warning("Failed to find source file path.\n");
+			return ret;
+		}
+
 		/* Matching lazy line pattern */
-		ret = find_lazy_match_lines(pf->lcache, pf->fname,
+		ret = find_lazy_match_lines(pf->lcache, fpath,
 					    pf->pev->point.lazy_line);
+		free(fpath);
 		if (ret <= 0)
 			return ret;
 	}
-- 
2.3.0


  reply	other threads:[~2015-02-26  7:14 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-02-26  7:12 [PATCH 1/2] perf probe: export get_real_path Naohiro Aota
2015-02-26  7:12 ` Naohiro Aota [this message]
2015-02-26  8:08   ` [PATCH 2/2] perf probe: Find compilation directory path for lazy matching Masami Hiramatsu
2015-02-26  8:25     ` [PATCH perf/core ] [BUGFIX] perf-probe: Fix get_real_path to free allocated memory in error path Masami Hiramatsu
2015-02-26 14:46       ` Arnaldo Carvalho de Melo
2015-02-27  0:58         ` Masami Hiramatsu
2015-02-28  9:31       ` [tip:perf/core] perf probe: " tip-bot for Masami Hiramatsu
2015-02-26  7:50 ` [PATCH 1/2] perf probe: export get_real_path Masami Hiramatsu
2015-03-04  7:52 ` [PATCH v2] perf probe: Find compilation directory path for lazy matching Naohiro Aota
2015-03-04 12:34   ` Masami Hiramatsu
2015-03-11 13:30     ` Arnaldo Carvalho de Melo
2015-03-12  1:42       ` Masami Hiramatsu
2015-03-13  5:13         ` Naohiro Aota
2015-03-13  5:18       ` [PATCH v3] " Naohiro Aota
2015-03-13 12:21         ` Masami Hiramatsu
2015-04-13 23:10         ` Arnaldo Carvalho de Melo
2015-04-14  6:35           ` Masami Hiramatsu
2015-04-14 12:17         ` [tip:perf/urgent] " tip-bot for Naohiro Aota

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1424934769-19481-2-git-send-email-naota@elisp.net \
    --to=naota@elisp.net \
    --cc=a.p.zijlstra@chello.nl \
    --cc=acme@kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=masami.hiramatsu.pt@hitachi.com \
    --cc=namhyung@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®