Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bfbba189 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

perf symbols: Move fprintf routines to separate object file 

To disentangle symbol printing from all the code related to symbol
tables, resolution of addresses to symbols, etc.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/n/tip-eik9g3hbtdc7ddv57f1d4v3p@git.kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent de446b40

tools/perf/util/Build

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ libperf-y += usage.o 
libperf-y += wrapper.o

libperf-y += dso.o

libperf-y += symbol.o

libperf-y += symbol_fprintf.o

libperf-y += color.o

libperf-y += header.o

libperf-y += callchain.o

tools/perf/util/python-ext-sources

+1 −0
Original line number Diff line number Diff line
@@ -23,3 +23,4 @@ util/strlist.c 
util/trace-event.c

../lib/rbtree.c

util/string.c

util/symbol_fprintf.c

tools/perf/util/symbol.c

+0 −71
Original line number Diff line number Diff line
@@ -255,57 +255,6 @@ void symbol__delete(struct symbol *sym) 
	free(((void *)sym) - symbol_conf.priv_size);

}



size_t symbol__fprintf(struct symbol *sym, FILE *fp)

{

	return fprintf(fp, " %" PRIx64 "-%" PRIx64 " %c %s\n",

		       sym->start, sym->end,

		       sym->binding == STB_GLOBAL ? 'g' :

		       sym->binding == STB_LOCAL  ? 'l' : 'w',

		       sym->name);

}



size_t __symbol__fprintf_symname_offs(const struct symbol *sym,

				      const struct addr_location *al,

				      bool unknown_as_addr, FILE *fp)

{

	unsigned long offset;

	size_t length;



	if (sym && sym->name) {

		length = fprintf(fp, "%s", sym->name);

		if (al) {

			if (al->addr < sym->end)

				offset = al->addr - sym->start;

			else

				offset = al->addr - al->map->start - sym->start;

			length += fprintf(fp, "+0x%lx", offset);

		}

		return length;

	} else if (al && unknown_as_addr)

		return fprintf(fp, "[%#" PRIx64 "]", al->addr);

	else

		return fprintf(fp, "[unknown]");

}



size_t symbol__fprintf_symname_offs(const struct symbol *sym,

				    const struct addr_location *al,

				    FILE *fp)

{

	return __symbol__fprintf_symname_offs(sym, al, false, fp);

}



size_t __symbol__fprintf_symname(const struct symbol *sym,

				 const struct addr_location *al,

				 bool unknown_as_addr, FILE *fp)

{

	return __symbol__fprintf_symname_offs(sym, al, unknown_as_addr, fp);

}



size_t symbol__fprintf_symname(const struct symbol *sym, FILE *fp)

{

	return __symbol__fprintf_symname_offs(sym, NULL, false, fp);

}



void symbols__delete(struct rb_root *symbols)

{

	struct symbol *pos;
@@ -381,11 +330,6 @@ static struct symbol *symbols__next(struct symbol *sym) 
	return NULL;

}



struct symbol_name_rb_node {

	struct rb_node	rb_node;

	struct symbol	sym;

};



static void symbols__insert_by_name(struct rb_root *symbols, struct symbol *sym)

{

	struct rb_node **p = &symbols->rb_node;
@@ -514,21 +458,6 @@ void dso__sort_by_name(struct dso *dso, enum map_type type) 
				     &dso->symbols[type]);

}



size_t dso__fprintf_symbols_by_name(struct dso *dso,

				    enum map_type type, FILE *fp)

{

	size_t ret = 0;

	struct rb_node *nd;

	struct symbol_name_rb_node *pos;



	for (nd = rb_first(&dso->symbol_names[type]); nd; nd = rb_next(nd)) {

		pos = rb_entry(nd, struct symbol_name_rb_node, rb_node);

		fprintf(fp, "%s\n", pos->sym.name);

	}



	return ret;

}



int modules__parse(const char *filename, void *arg,

		   int (*process_module)(void *arg, const char *name,

					 u64 start))

tools/perf/util/symbol.h

+5 −0
Original line number Diff line number Diff line
@@ -140,6 +140,11 @@ struct symbol_conf { 


extern struct symbol_conf symbol_conf;



struct symbol_name_rb_node {

	struct rb_node	rb_node;

	struct symbol	sym;

};



static inline int __symbol__join_symfs(char *bf, size_t size, const char *path)

{

	return path__join(bf, size, symbol_conf.symfs, path);

tools/perf/util/symbol_fprintf.c

0 → 100644
+71 −0
Original line number Diff line number Diff line 
#include <elf.h>

#include <inttypes.h>

#include <stdio.h>



#include "symbol.h"



size_t symbol__fprintf(struct symbol *sym, FILE *fp)

{

	return fprintf(fp, " %" PRIx64 "-%" PRIx64 " %c %s\n",

		       sym->start, sym->end,

		       sym->binding == STB_GLOBAL ? 'g' :

		       sym->binding == STB_LOCAL  ? 'l' : 'w',

		       sym->name);

}



size_t __symbol__fprintf_symname_offs(const struct symbol *sym,

				      const struct addr_location *al,

				      bool unknown_as_addr, FILE *fp)

{

	unsigned long offset;

	size_t length;



	if (sym && sym->name) {

		length = fprintf(fp, "%s", sym->name);

		if (al) {

			if (al->addr < sym->end)

				offset = al->addr - sym->start;

			else

				offset = al->addr - al->map->start - sym->start;

			length += fprintf(fp, "+0x%lx", offset);

		}

		return length;

	} else if (al && unknown_as_addr)

		return fprintf(fp, "[%#" PRIx64 "]", al->addr);

	else

		return fprintf(fp, "[unknown]");

}



size_t symbol__fprintf_symname_offs(const struct symbol *sym,

				    const struct addr_location *al,

				    FILE *fp)

{

	return __symbol__fprintf_symname_offs(sym, al, false, fp);

}



size_t __symbol__fprintf_symname(const struct symbol *sym,

				 const struct addr_location *al,

				 bool unknown_as_addr, FILE *fp)

{

	return __symbol__fprintf_symname_offs(sym, al, unknown_as_addr, fp);

}



size_t symbol__fprintf_symname(const struct symbol *sym, FILE *fp)

{

	return __symbol__fprintf_symname_offs(sym, NULL, false, fp);

}



size_t dso__fprintf_symbols_by_name(struct dso *dso,

				    enum map_type type, FILE *fp)

{

	size_t ret = 0;

	struct rb_node *nd;

	struct symbol_name_rb_node *pos;



	for (nd = rb_first(&dso->symbol_names[type]); nd; nd = rb_next(nd)) {

		pos = rb_entry(nd, struct symbol_name_rb_node, rb_node);

		fprintf(fp, "%s\n", pos->sym.name);

	}



	return ret;

}