perf symbols: Add a long_name_len member to struct dso

Using a two bytes hole we already had and since we also need to
calculate this strlen for fetching the buildids. We'll use it in
'perf top' to auto-adjust the output based on the terminal
width.

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Frédéric Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>
LKML-Reference: <1258479655-28662-1-git-send-email-acme@infradead.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c
index 1b77e81b38de2fe7008fc09cd51aa753f4959ff9..5cc96c86861bd644c4e6d5579922341f8d45a30e 100644 (file)
--- a/tools/perf/util/symbol.c
+++ b/tools/perf/util/symbol.c
@@ -109,13 +109,24 @@ static size_t symbol__fprintf(struct symbol *self, FILE *fp)
                       self->start, self->end, self->name);
 }
 
+static void dso__set_long_name(struct dso *self, char *name)
+{
+       self->long_name = name;
+       self->long_name_len = strlen(name);
+}
+
+static void dso__set_basename(struct dso *self)
+{
+       self->short_name = basename(self->long_name);
+}
+
 struct dso *dso__new(const char *name)
 {
        struct dso *self = malloc(sizeof(*self) + strlen(name) + 1);
 
        if (self != NULL) {
                strcpy(self->name, name);
-               self->long_name = self->name;
+               dso__set_long_name(self, self->name);
                self->short_name = self->name;
                self->syms = RB_ROOT;
                self->find_symbol = dso__find_symbol;
@@ -888,7 +899,7 @@ bool fetch_build_id_table(struct list_head *head)
                        continue;
                have_buildid = true;
                memset(&b.header, 0, sizeof(b.header));
-               len = strlen(pos->long_name) + 1;
+               len = pos->long_name_len + 1;
                len = ALIGN(len, 64);
                b.header.size = sizeof(b) + len;
 
@@ -1165,6 +1176,7 @@ static int dsos__load_modules_sym_dir(char *dirname, symbol_filter_t filter)
                             dso_name[PATH_MAX];
                        struct map *map;
                        struct rb_node *last;
+                       char *long_name;
 
                        if (dot == NULL || strcmp(dot, ".ko"))
                                continue;
@@ -1179,9 +1191,11 @@ static int dsos__load_modules_sym_dir(char *dirname, symbol_filter_t filter)
                        snprintf(path, sizeof(path), "%s/%s",
                                 dirname, dent->d_name);
 
-                       map->dso->long_name = strdup(path);
-                       if (map->dso->long_name == NULL)
+                       long_name = strdup(path);
+                       if (long_name == NULL)
                                goto failure;
+                       dso__set_long_name(map->dso, long_name);
+                       dso__set_basename(map->dso);
 
                        err = dso__load_module_sym(map->dso, map, filter);
                        if (err < 0)
@@ -1420,8 +1434,10 @@ struct dso *dsos__findnew(const char *name)
 
        if (!dso) {
                dso = dso__new(name);
-               if (dso != NULL)
+               if (dso != NULL) {
                        dsos__add(dso);
+                       dso__set_basename(dso);
+               }
        }
 
        return dso;

diff --git a/tools/perf/util/symbol.h b/tools/perf/util/symbol.h
index 51c5a4a0813332326c11adbc6b1b052b1942641d..5ad1019607dd7ae9a9f215104769a3c70e066b35 100644 (file)
--- a/tools/perf/util/symbol.h
+++ b/tools/perf/util/symbol.h
@@ -66,6 +66,7 @@ struct dso {
        u8               has_build_id:1;
        unsigned char    origin;
        u8               build_id[BUILD_ID_SIZE];
+       u16              long_name_len;
        const char       *short_name;
        char             *long_name;
        char             name[0];