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>
This commit is contained in:
@@ -30,7 +30,6 @@
|
||||
#define SHOW_HV 4
|
||||
|
||||
static char const *input_name = "perf.data";
|
||||
static char *vmlinux = NULL;
|
||||
|
||||
static char default_sort_order[] = "comm,dso,symbol";
|
||||
static char *sort_order = default_sort_order;
|
||||
@@ -46,11 +45,6 @@ static int dump_trace = 0;
|
||||
#define dprintf(x...) do { if (dump_trace) printf(x); } while (0)
|
||||
#define cdprintf(x...) do { if (dump_trace) color_fprintf(stdout, color, x); } while (0)
|
||||
|
||||
static int verbose;
|
||||
#define eprintf(x...) do { if (verbose) fprintf(stderr, x); } while (0)
|
||||
|
||||
static int modules;
|
||||
|
||||
static int full_paths;
|
||||
static int show_nr_samples;
|
||||
|
||||
@@ -161,98 +155,7 @@ static int repsep_fprintf(FILE *fp, const char *fmt, ...)
|
||||
return n;
|
||||
}
|
||||
|
||||
static LIST_HEAD(dsos);
|
||||
static struct dso *kernel_dso;
|
||||
static struct dso *vdso;
|
||||
static struct dso *hypervisor_dso;
|
||||
|
||||
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;
|
||||
}
|
||||
|
||||
static 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;
|
||||
}
|
||||
|
||||
static 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);
|
||||
}
|
||||
|
||||
static 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;
|
||||
}
|
||||
|
||||
static char __cwd[PATH_MAX];
|
||||
static char *cwd = __cwd;
|
||||
|
Reference in New Issue
Block a user