perf kallsyms: Adopt hex2u64 from tools/perf/util/util.h
tip-bot for Arnaldo Carvalho de Melo
merge botCommit-ID: 155681fcd7f82882a730240c2dde7eee76a46314 Gitweb: https://git.kernel.org/tip/155681fcd7f82882a730240c2dde7eee76a46314 Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Tue, 25 Jun 2019 18:13:17 -0300 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Tue, 25 Jun 2019 18:13:17 -0300
perf kallsyms: Adopt hex2u64 from tools/perf/util/util.h
Just removing more stuff from tools/perf/, this is mostly used in the kallsyms parsing and in places in perf where kallsyms is involved, so we get it for free there.
With this we reduce a bit more util.h.
Cc Adrian Hunter <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Namhyung Kim <[email protected]>
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
--- tools/lib/symbol/kallsyms.c | 13 +++++++++++++ tools/lib/symbol/kallsyms.h | 2 ++ tools/perf/util/util.c | 13 ------------- tools/perf/util/util.h | 1 - 4 files changed, 15 insertions(+), 14 deletions(-)
tools/lib/symbol/kallsyms.c +13 -0
@@ -16,6 +16,19 @@ bool kallsyms__is_function(char symbol_type)return symbol_type =='T' || symbol_type =='W' ; } +/* +* 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; +} +int kallsyms__parse (const char *filename,void *arg,int (*process_symbol)(void *arg,const char *name,char type,u64 start))
tools/lib/symbol/kallsyms.h +2 -0
@@ -18,6 +18,8 @@ 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);
tools/perf/util/util.c +0 -13
@@ -434,19 +434,6 @@ size_t hex_width(u64 v)return n; } -/* -* 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; -} -int perf_event_paranoid (void ) {int value;
tools/perf/util/util.h +0 -1
@@ -43,7 +43,6 @@ ssize_t readn(int fd, void *buf, size_t n);ssize_t writen (int fd,const void *buf,size_t n);size_t hex_width (u64 v); -int hex2u64 (const char *ptr,u64 *val);extern unsigned int page_size;int __pure cacheline_size (void );