Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 323677
b: refs/heads/master
c: 8215152
h: refs/heads/master
i:
  323675: 33d9450
v: v3
  • Loading branch information
Cody P Schafer authored and Arnaldo Carvalho de Melo committed Aug 13, 2012
1 parent 8a237d3 commit f6b7a08
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 14 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 72f86204419e1b83f18b9bc2c97141a52dc534d2
refs/heads/master: 82151520938ec79e5e3adb7e61977f002031c38c
2 changes: 1 addition & 1 deletion trunk/tools/perf/util/event.c
Original file line number Diff line number Diff line change
Expand Up @@ -412,7 +412,7 @@ struct process_symbol_args {
};

static int find_symbol_cb(void *arg, const char *name, char type,
u64 start, u64 end __used)
u64 start)
{
struct process_symbol_args *args = arg;

Expand Down
21 changes: 10 additions & 11 deletions trunk/tools/perf/util/symbol.c
Original file line number Diff line number Diff line change
Expand Up @@ -563,7 +563,7 @@ size_t dso__fprintf(struct dso *dso, enum map_type type, FILE *fp)

int kallsyms__parse(const char *filename, void *arg,
int (*process_symbol)(void *arg, const char *name,
char type, u64 start, u64 end))
char type, u64 start))
{
char *line = NULL;
size_t n;
Expand Down Expand Up @@ -603,13 +603,8 @@ int kallsyms__parse(const char *filename, void *arg,
break;
}

/*
* module symbols are not sorted so we add all
* symbols, setting length to 1, and rely on
* symbols__fixup_end() to fix it up.
*/
err = process_symbol(arg, symbol_name,
symbol_type, start, start);
symbol_type, start);
if (err)
break;
}
Expand All @@ -636,7 +631,7 @@ static u8 kallsyms2elf_type(char type)
}

static int map__process_kallsym_symbol(void *arg, const char *name,
char type, u64 start, u64 end)
char type, u64 start)
{
struct symbol *sym;
struct process_kallsyms_args *a = arg;
Expand All @@ -645,8 +640,12 @@ static int map__process_kallsym_symbol(void *arg, const char *name,
if (!symbol_type__is_a(type, a->map->type))
return 0;

sym = symbol__new(start, end - start + 1,
kallsyms2elf_type(type), name);
/*
* module symbols are not sorted so we add all
* symbols, setting length to 0, and rely on
* symbols__fixup_end() to fix it up.
*/
sym = symbol__new(start, 0, kallsyms2elf_type(type), name);
if (sym == NULL)
return -ENOMEM;
/*
Expand Down Expand Up @@ -1729,7 +1728,7 @@ struct process_args {
};

static int symbol__in_kernel(void *arg, const char *name,
char type __used, u64 start, u64 end __used)
char type __used, u64 start)
{
struct process_args *args = arg;

Expand Down
2 changes: 1 addition & 1 deletion trunk/tools/perf/util/symbol.h
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ bool __dsos__read_build_ids(struct list_head *head, bool with_hits);
int build_id__sprintf(const u8 *build_id, int len, char *bf);
int kallsyms__parse(const char *filename, void *arg,
int (*process_symbol)(void *arg, const char *name,
char type, u64 start, u64 end));
char type, u64 start));
int filename__read_debuglink(const char *filename, char *debuglink,
size_t size);

Expand Down

0 comments on commit f6b7a08

Please sign in to comment.