perf probe: Support vmlinux on cwd by default

Support vmlinux on current working direcotry by default and
also update file-open messages.
Now perf probe searches ./vmlinux too.

Signed-off-by: Masami Hiramatsu <[email protected]>
Cc: Steven Rostedt <[email protected]>
Cc: Jim Keniston <[email protected]>
Cc: Ananth N Mavinakayanahalli <[email protected]>
Cc: Christoph Hellwig <[email protected]>
Cc: Frank Ch. Eigler <[email protected]>
Cc: Frederic Weisbecker <[email protected]>
Cc: Jason Baron <[email protected]>
Cc: K.Prasad <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Srikar Dronamraju <[email protected]>
Cc: Arnaldo Carvalho de Melo <[email protected]>
Cc: systemtap <[email protected]>
Cc: DLE <[email protected]>
LKML-Reference: <20091208220309[email protected]>
Signed-off-by: Ingo Molnar <[email protected]>

diff --git a/tools/perf/builtin-probe.c b/tools/perf/builtin-probe.c
index 1347fdf5337ece65de8d23e36883a3e3a68472a6..1c97e133a3f420066cb307c28f451093668d0204 100644 (file)
--- a/tools/perf/builtin-probe.c
+++ b/tools/perf/builtin-probe.c
@@ -43,11 +43,12 @@
 #include "util/probe-event.h"
 
 /* Default vmlinux search paths */
-#define NR_SEARCH_PATH 3
+#define NR_SEARCH_PATH 4
 const char *default_search_path[NR_SEARCH_PATH] = {
 "/lib/modules/%s/build/vmlinux",               /* Custom build kernel */
 "/usr/lib/debug/lib/modules/%s/vmlinux",       /* Red Hat debuginfo */
 "/boot/vmlinux-debug-%s",                      /* Ubuntu */
+"./vmlinux",                                   /* CWD */
 };
 
 #define MAX_PATH_LEN 256
@@ -205,13 +206,14 @@ int cmd_probe(int argc, const char **argv, const char *prefix __used)
 #else  /* !NO_LIBDWARF */
                pr_debug("Some probes require debuginfo.\n");
 
-       if (session.vmlinux)
+       if (session.vmlinux) {
+               pr_debug("Try to open %s.", session.vmlinux);
                fd = open(session.vmlinux, O_RDONLY);
-       else
+       } else
                fd = open_default_vmlinux();
        if (fd < 0) {
                if (session.need_dwarf)
-                       die("Could not open vmlinux/module file.");
+                       die("Could not open debuginfo file.");
 
                pr_debug("Could not open vmlinux/module file."
                         " Try to use symbols.\n");