From a827c875f2ebe69c6e6db5e7f112d4beb4d80f01 Mon Sep 17 00:00:00 2001
From: Arnaldo Carvalho de Melo <acme@redhat.com>
Date: Thu, 28 May 2009 14:55:19 -0300
Subject: [PATCH] perf_counter tools: Consolidate dso methods to load kernel
symbols
Now one has just to use dso__load_kernel() optionally passing a vmlinux
filename.
Will make things easier for perf top that will want to pass a callback
to filter some symbols.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
Documentation/perf_counter/builtin-report.c | 9 ++-------
Documentation/perf_counter/util/symbol.c | 17 +++++++++++++++--
Documentation/perf_counter/util/symbol.h | 3 +--
3 files changed, 18 insertions(+), 11 deletions(-)
diff --git a/Documentation/perf_counter/builtin-report.c b/Documentation/perf_counter/builtin-report.c
index 889067eb2b69..4e9f2bc10452 100644
--- a/Documentation/perf_counter/builtin-report.c
+++ b/Documentation/perf_counter/builtin-report.c
@@ -118,18 +118,13 @@ static void dsos__fprintf(FILE *fp)
static int load_kernel(void)
{
- int err = -1;
+ int err;
kernel_dso = dso__new("[kernel]", 0);
if (!kernel_dso)
return -1;
- if (vmlinux)
- err = dso__load_vmlinux(kernel_dso, vmlinux);
-
- if (err)
- err = dso__load_kallsyms(kernel_dso);
-
+ err = dso__load_kernel(kernel_dso, vmlinux);
if (err) {
dso__delete(kernel_dso);
kernel_dso = NULL;
diff --git a/Documentation/perf_counter/util/symbol.c b/Documentation/perf_counter/util/symbol.c
index 7088206244ac..504ac3132019 100644
--- a/Documentation/perf_counter/util/symbol.c
+++ b/Documentation/perf_counter/util/symbol.c
@@ -155,7 +155,7 @@ static int hex2long(char *ptr, unsigned long *long_val)
return p - ptr;
}
-int dso__load_kallsyms(struct dso *self)
+static int dso__load_kallsyms(struct dso *self)
{
struct rb_node *nd, *prevnd;
char *line = NULL;
@@ -410,7 +410,7 @@ int dso__load(struct dso *self)
return ret;
}
-int dso__load_vmlinux(struct dso *self, const char *vmlinux)
+static int dso__load_vmlinux(struct dso *self, const char *vmlinux)
{
int err, fd = open(vmlinux, O_RDONLY);
@@ -423,6 +423,19 @@ int dso__load_vmlinux(struct dso *self, const char *vmlinux)
return err;
}
+int dso__load_kernel(struct dso *self, const char *vmlinux)
+{
+ int err = -1;
+
+ if (vmlinux)
+ err = dso__load_vmlinux(self, vmlinux);
+
+ if (err)
+ err = dso__load_kallsyms(self);
+
+ return err;
+}
+
void symbol__init(void)
{
elf_version(EV_CURRENT);
diff --git a/Documentation/perf_counter/util/symbol.h b/Documentation/perf_counter/util/symbol.h
index 9e120af9c71f..db2fdf9f70a2 100644
--- a/Documentation/perf_counter/util/symbol.h
+++ b/Documentation/perf_counter/util/symbol.h
@@ -29,8 +29,7 @@ static inline void *dso__sym_priv(struct dso *self, struct symbol *sym)
struct symbol *dso__find_symbol(struct dso *self, uint64_t ip);
-int dso__load_kallsyms(struct dso *self);
-int dso__load_vmlinux(struct dso *self, const char *vmlinux);
+int dso__load_kernel(struct dso *self, const char *vmlinux);
int dso__load(struct dso *self);
size_t dso__fprintf(struct dso *self, FILE *fp);
--
GitLab