Skip to content

Commit

Permalink
libsymbols kallsyms: Move hex2u64 out of header
Browse files Browse the repository at this point in the history
hex2u64 is a helper that's out of place in kallsyms.h as not being
kallsyms related. Move from kallsyms.h to the only user.

Committer notes:

Move it out of tools/lib/symbol/kallsyms.c as well, as we had to leave
it there in the previous patch lest we break the build.

Signed-off-by: Ian Rogers <irogers@google.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lore.kernel.org/lkml/20200501221315.54715-4-irogers@google.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
  • Loading branch information
Ian Rogers authored and Arnaldo Carvalho de Melo committed May 5, 2020
1 parent 53df2b9 commit 32add10
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 15 deletions.
13 changes: 0 additions & 13 deletions tools/lib/symbol/kallsyms.c
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,6 @@ u8 kallsyms2elf_type(char type)
return (type == 't' || type == 'w') ? STT_FUNC : STT_OBJECT;
}

/*
* While we find nice hex chars, build a long_val.
* Return number of chars processed.
*/
int hex2u64(const char *ptr, u64 *long_val)
{
char *p;

*long_val = strtoull(ptr, &p, 16);

return p - ptr;
}

bool kallsyms__is_function(char symbol_type)
{
symbol_type = toupper(symbol_type);
Expand Down
2 changes: 0 additions & 2 deletions tools/lib/symbol/kallsyms.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@ static inline u8 kallsyms2elf_binding(char type)
return isupper(type) ? STB_GLOBAL : STB_LOCAL;
}

int hex2u64(const char *ptr, u64 *long_val);

u8 kallsyms2elf_type(char type);

bool kallsyms__is_function(char symbol_type);
Expand Down
14 changes: 14 additions & 0 deletions tools/perf/util/symbol.c
Original file line number Diff line number Diff line change
Expand Up @@ -566,6 +566,20 @@ void dso__sort_by_name(struct dso *dso)
return symbols__sort_by_name(&dso->symbol_names, &dso->symbols);
}

/*
* While we find nice hex chars, build a long_val.
* Return number of chars processed.
*/
static int hex2u64(const char *ptr, u64 *long_val)
{
char *p;

*long_val = strtoull(ptr, &p, 16);

return p - ptr;
}


int modules__parse(const char *filename, void *arg,
int (*process_module)(void *arg, const char *name,
u64 start, u64 size))
Expand Down

0 comments on commit 32add10

Please sign in to comment.