lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

perf report: Only load text symbols from kallsyms, fix

Browse Source 
- allow 'W' symbols too
 - Convert initializations to C99 style
 - whitespace cleanups

Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Cc: Marcelo Tosatti <mtosatti@redhat.com>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: John Kacur <jkacur@redhat.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
LKML-Reference: <20090526222155.GJ4424@ghostprotocols.net>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Ingo Molnar
2009-05-27 08:38:48 +02:00
parent 03f6316d32
commit af83632f98
1 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
Documentation/perf_counter/builtin-report.c
View File

@@ -384,21 +384,26 @@ int hex2long(char *ptr, unsigned long *long_val)
static int load_kallsyms(void) static int load_kallsyms(void)
{ {
struct rb_node *nd, *prevnd;
char *line = NULL;
FILE *file;
size_t n;
kernel_dso = dso__new("[kernel]"); kernel_dso = dso__new("[kernel]");
if (kernel_dso == NULL) if (kernel_dso == NULL)
return -1; return -1;
FILE *file = fopen("/proc/kallsyms", "r"); file = fopen("/proc/kallsyms", "r");
if (file == NULL) if (file == NULL)
goto out_delete_dso; goto out_delete_dso;
char *line = NULL;
size_t n;
while (!feof(file)) { while (!feof(file)) {
unsigned long start; unsigned long start;
int line_len = getline(&line, &n, file); struct symbol *sym;
int line_len, len;
char symbol_type;
line_len = getline(&line, &n, file);
if (line_len < 0) if (line_len < 0)
break; break;
@@ -407,22 +412,22 @@ static int load_kallsyms(void)
line[--line_len] = '\0'; /* \n */ line[--line_len] = '\0'; /* \n */
int len = hex2long(line, &start); len = hex2long(line, &start);
len++; len++;
if (len + 2 >= line_len) if (len + 2 >= line_len)
continue; continue;
char symbol_type = line[len]; symbol_type = toupper(line[len]);
/* /*
* We're interested only in code ('T'ext) * We're interested only in code ('T'ext)
*/ */
if (toupper(symbol_type) != 'T') if (symbol_type != 'T' && symbol_type != 'W')
continue; continue;
/* /*
* Well fix up the end later, when we have all sorted. * Well fix up the end later, when we have all sorted.
*/ */
struct symbol *sym = symbol__new(start, 0xdead, line + len + 2); sym = symbol__new(start, 0xdead, line + len + 2);
if (sym == NULL) if (sym == NULL)
goto out_delete_dso; goto out_delete_dso;
@@ -434,7 +439,7 @@ static int load_kallsyms(void)
* Now that we have all sorted out, just set the ->end of all * Now that we have all sorted out, just set the ->end of all
* symbols * symbols
*/ */
struct rb_node *nd, *prevnd = rb_first(&kernel_dso->syms); prevnd = rb_first(&kernel_dso->syms);
if (prevnd == NULL) if (prevnd == NULL)
goto out_delete_line; goto out_delete_line;
@@ -450,6 +455,7 @@ static int load_kallsyms(void)
dsos__add(kernel_dso); dsos__add(kernel_dso);
free(line); free(line);
fclose(file); fclose(file);
return 0; return 0;
out_delete_line: out_delete_line: