[PATCH -tip 1/3] [CLEANUP] perf-probe: Expand given path to absolute path

[Masami Hiramatsu]

Expand given path to absolute path in option parser,
except for a module name. Instead of expanding it later,
this get the absolute path in early stage.

Signed-off-by: Masami Hiramatsu <masami.hiramatsu...@hitachi.com>
---
 tools/perf/builtin-probe.c    |    9 +++++++++
 tools/perf/util/probe-event.c |   11 ++---------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/tools/perf/builtin-probe.c b/tools/perf/builtin-probe.c
index 6ea9e85..b40d064 100644
--- a/tools/perf/builtin-probe.c
+++ b/tools/perf/builtin-probe.c
@@ -180,6 +180,15 @@ static int opt_set_target(const struct option *opt, const 
char *str,
                else
                        return ret;
 
+               /* Expand given path to absolute path, except for modulename */
+               if (params.uprobes || strchr(str, '/')) {
+                       str = realpath(str, NULL);
+                       if (!str) {
+                               pr_warning("Failed to find the path of %s.\n",
+                                          str);
+                               return ret;
+                       }
+               }
                params.target = str;
                ret = 0;
        }
diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c
index d7cff57..05be5de 100644
--- a/tools/perf/util/probe-event.c
+++ b/tools/perf/util/probe-event.c
@@ -2281,7 +2281,7 @@ static int convert_name_to_addr(struct perf_probe_event 
*pev, const char *exec)
        struct perf_probe_point *pp = &pev->point;
        struct symbol *sym;
        struct map *map = NULL;
-       char *function = NULL, *name = NULL;
+       char *function = NULL;
        int ret = -EINVAL;
        unsigned long long vaddr = 0;
 
@@ -2297,12 +2297,7 @@ static int convert_name_to_addr(struct perf_probe_event 
*pev, const char *exec)
                goto out;
        }
 
-       name = realpath(exec, NULL);
-       if (!name) {
-               pr_warning("Cannot find realpath for %s.\n", exec);
-               goto out;
-       }
-       map = dso__new_map(name);
+       map = dso__new_map(exec);
        if (!map) {
                pr_warning("Cannot find appropriate DSO for %s.\n", exec);
                goto out;
@@ -2367,7 +2362,5 @@ out:
        }
        if (function)
                free(function);
-       if (name)
-               free(name);
        return ret;
 }


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/