Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754462AbbDMWPk (ORCPT ); Mon, 13 Apr 2015 18:15:40 -0400 Received: from mail.kernel.org ([198.145.29.136]:38503 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752087AbbDMWPc (ORCPT ); Mon, 13 Apr 2015 18:15:32 -0400 From: Arnaldo Carvalho de Melo To: Ingo Molnar Cc: linux-kernel@vger.kernel.org, He Kuang , Namhyung Kim , Peter Zijlstra , Wang Nan , Arnaldo Carvalho de Melo Subject: [PATCH 4/5] perf probe: Make --source avaiable when probe with lazy_line Date: Mon, 13 Apr 2015 19:15:01 -0300 Message-Id: <1428963302-31538-5-git-send-email-acme@kernel.org> X-Mailer: git-send-email 1.9.3 In-Reply-To: <1428963302-31538-1-git-send-email-acme@kernel.org> References: <1428963302-31538-1-git-send-email-acme@kernel.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3570 Lines: 105 From: He Kuang Use get_real_path() to enable --source option when probe with lazy_line pattern. Before this patch: $ perf probe -s ./kernel_src/ -k ./vmlinux --add='fs/super.c;s->s_count=1;' Failed to open fs/super.c: No such file or directory Error: Failed to add events. After this patch: $ perf probe -s ./kernel_src/ -k ./vmlinux --add='fs/super.c;s->s_count=1;' Added new events: probe:_stext (on @fs/super.c) probe:_stext_1 (on @fs/super.c) ... Signed-off-by: He Kuang Acked-by: Masami Hiramatsu Cc: Namhyung Kim Cc: Peter Zijlstra Cc: Wang Nan Link: http://lkml.kernel.org/r/1428925290-5623-2-git-send-email-hekuang@huawei.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/probe-event.c | 2 +- tools/perf/util/probe-event.h | 2 ++ tools/perf/util/probe-finder.c | 18 +++++++++++++++--- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c index 5483d98236d3..35ee51a8724f 100644 --- a/tools/perf/util/probe-event.c +++ b/tools/perf/util/probe-event.c @@ -661,7 +661,7 @@ static int try_to_find_probe_trace_events(struct perf_probe_event *pev, * a newly allocated path on success. * Return 0 if file was found and readable, -errno otherwise. */ -static int get_real_path(const char *raw_path, const char *comp_dir, +int get_real_path(const char *raw_path, const char *comp_dir, char **new_path) { const char *prefix = symbol_conf.source_prefix; diff --git a/tools/perf/util/probe-event.h b/tools/perf/util/probe-event.h index d6b783447be9..21809ea9b2b4 100644 --- a/tools/perf/util/probe-event.h +++ b/tools/perf/util/probe-event.h @@ -135,6 +135,8 @@ extern int show_available_vars(struct perf_probe_event *pevs, int npevs, struct strfilter *filter, bool externs); extern int show_available_funcs(const char *module, struct strfilter *filter, bool user); +extern int get_real_path(const char *raw_path, const char *comp_dir, + char **new_path); /* Maximum index number of event-name postfix */ #define MAX_EVENT_INDEX 1024 diff --git a/tools/perf/util/probe-finder.c b/tools/perf/util/probe-finder.c index 7831e2d93949..431c12d299a2 100644 --- a/tools/perf/util/probe-finder.c +++ b/tools/perf/util/probe-finder.c @@ -791,11 +791,20 @@ static int find_lazy_match_lines(struct intlist *list, ssize_t len; int count = 0, linenum = 1; char sbuf[STRERR_BUFSIZE]; + char *realname = NULL; + int ret; - fp = fopen(fname, "r"); + ret = get_real_path(fname, NULL, &realname); + if (ret < 0) { + pr_warning("Failed to find source file %s.\n", fname); + return ret; + } + + fp = fopen(realname, "r"); if (!fp) { - pr_warning("Failed to open %s: %s\n", fname, + pr_warning("Failed to open %s: %s\n", realname, strerror_r(errno, sbuf, sizeof(sbuf))); + free(realname); return -errno; } @@ -817,7 +826,10 @@ static int find_lazy_match_lines(struct intlist *list, fclose(fp); if (count == 0) - pr_debug("No matched lines found in %s.\n", fname); + pr_debug("No matched lines found in %s.\n", realname); + + free(realname); + return count; } -- 1.9.3 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/