perf tools: Factorize high level dso helpers

Factorize multiple definitions of high level dso helpers into the
symbol source file.

The side effect is a general export of the verbose and eprintf
debugging helpers into a new file dedicated to debugging purposes.

Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Brice Goglin <Brice.Goglin@inria.fr>

4 files changed, 135 insertions, 0 deletions

diff --git a/tools/perf/util/debug.c b/tools/perf/util/debug.c
new file mode 100644
index 000000000000..7cb8464abe61
--- /dev/null
+++ b/tools/perf/util/debug.c
@@ -0,0 +1,22 @@
+/* For general debugging purposes */
+
+#include "../perf.h"
+#include <string.h>
+#include <stdarg.h>
+#include <stdio.h>
+
+int verbose = 0;
+
+int eprintf(const char *fmt, ...)
+{
+        va_list args;
+        int ret = 0;
+
+        if (verbose) {
+                va_start(args, fmt);
+                ret = vfprintf(stderr, fmt, args);
+                va_end(args);
+        }
+
+        return ret;
+}
diff --git a/tools/perf/util/debug.h b/tools/perf/util/debug.h
new file mode 100644
index 000000000000..2ae9090108d3
--- /dev/null
+++ b/tools/perf/util/debug.h
@@ -0,0 +1,5 @@
+/* For debugging general purposes */
+
+extern int verbose;
+
+int eprintf(const char *fmt, ...) __attribute__((format(printf, 1, 2)));
diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c
index f1dcede14307..e9b13b414955 100644
--- a/tools/perf/util/symbol.c
+++ b/tools/perf/util/symbol.c
@@ -937,6 +937,103 @@ int dso__load_kernel(struct dso *self, const char *vmlinux,
         return err;
 }
 
+LIST_HEAD(dsos);
+struct dso      *kernel_dso;
+struct dso      *vdso;
+struct dso      *hypervisor_dso;
+
+char            *vmlinux = "vmlinux";
+int             modules;
+
+static void dsos__add(struct dso *dso)
+{
+        list_add_tail(&dso->node, &dsos);
+}
+
+static struct dso *dsos__find(const char *name)
+{
+        struct dso *pos;
+
+        list_for_each_entry(pos, &dsos, node)
+                if (strcmp(pos->name, name) == 0)
+                        return pos;
+        return NULL;
+}
+
+struct dso *dsos__findnew(const char *name)
+{
+        struct dso *dso = dsos__find(name);
+        int nr;
+
+        if (dso)
+                return dso;
+
+        dso = dso__new(name, 0);
+        if (!dso)
+                goto out_delete_dso;
+
+        nr = dso__load(dso, NULL, verbose);
+        if (nr < 0) {
+                eprintf("Failed to open: %s\n", name);
+                goto out_delete_dso;
+        }
+        if (!nr)
+                eprintf("No symbols found in: %s, maybe install a debug package?\n", name);
+
+        dsos__add(dso);
+
+        return dso;
+
+out_delete_dso:
+        dso__delete(dso);
+        return NULL;
+}
+
+void dsos__fprintf(FILE *fp)
+{
+        struct dso *pos;
+
+        list_for_each_entry(pos, &dsos, node)
+                dso__fprintf(pos, fp);
+}
+
+static struct symbol *vdso__find_symbol(struct dso *dso, u64 ip)
+{
+        return dso__find_symbol(dso, ip);
+}
+
+int load_kernel(void)
+{
+        int err;
+
+        kernel_dso = dso__new("[kernel]", 0);
+        if (!kernel_dso)
+                return -1;
+
+        err = dso__load_kernel(kernel_dso, vmlinux, NULL, verbose, modules);
+        if (err <= 0) {
+                dso__delete(kernel_dso);
+                kernel_dso = NULL;
+        } else
+                dsos__add(kernel_dso);
+
+        vdso = dso__new("[vdso]", 0);
+        if (!vdso)
+                return -1;
+
+        vdso->find_symbol = vdso__find_symbol;
+
+        dsos__add(vdso);
+
+        hypervisor_dso = dso__new("[hypervisor]", 0);
+        if (!hypervisor_dso)
+                return -1;
+        dsos__add(hypervisor_dso);
+
+        return err;
+}
+
+
 void symbol__init(void)
 {
         elf_version(EV_CURRENT);
diff --git a/tools/perf/util/symbol.h b/tools/perf/util/symbol.h
index 1e003ec2f4b1..f3490fcd40ee 100644
--- a/tools/perf/util/symbol.h
+++ b/tools/perf/util/symbol.h
@@ -48,9 +48,20 @@ int dso__load_kernel(struct dso *self, const char *vmlinux,
                      symbol_filter_t filter, int verbose, int modules);
 int dso__load_modules(struct dso *self, symbol_filter_t filter, int verbose);
 int dso__load(struct dso *self, symbol_filter_t filter, int verbose);
+struct dso *dsos__findnew(const char *name);
+void dsos__fprintf(FILE *fp);
 
 size_t dso__fprintf(struct dso *self, FILE *fp);
 char dso__symtab_origin(const struct dso *self);
 
+int load_kernel(void);
+
 void symbol__init(void);
+
+extern struct list_head dsos;
+extern struct dso *kernel_dso;
+extern struct dso *vdso;
+extern struct dso *hypervisor_dso;
+extern char *vmlinux;
+extern int   modules;
 #endif /* _PERF_SYMBOL_ */