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

Commit 2f48fcd8 authored by Roberto Vitillo's avatar Roberto Vitillo Committed by Arnaldo Carvalho de Melo
Browse files

perf tools: Implement addr2line directly using libbfd 



When the srcline sort key is used , the external addr2line utility needs
to be run for each hist entry to get the srcline info.  This can consume
quite a time if one has a huge perf.data file.

So rather than executing the external utility, implement it internally
and just call it.  We can do it since we've linked with libbfd already.

Signed-off-by: default avatarRoberto Agostino Vitillo <ravitillo@lbl.gov>
Reviewed-by: default avatarJiri Olsa <jolsa@redhat.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung.kim@lge.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1378876173-13363-9-git-send-email-namhyung@kernel.org


[ Use a2l_data struct instead of static globals ]
Signed-off-by: default avatarNamhyung Kim <namhyung@kernel.org>
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 2cc9d0ef

tools/perf/config/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -523,6 +523,10 @@ ifndef NO_LIBNUMA 
  endif

endif



ifndef ($(filter -lbfd,$(EXTLIBS)),)

  CFLAGS += -DHAVE_LIBBFD_SUPPORT

endif



# Among the variables below, these:

#   perfexecdir

#   template_dir

tools/perf/util/srcline.c

+167 −0
Original line number Diff line number Diff line
@@ -8,6 +8,172 @@ 
#include "util/util.h"

#include "util/debug.h"



#ifdef HAVE_LIBBFD_SUPPORT



/*

 * Implement addr2line using libbfd.

 */

#define PACKAGE "perf"

#include <bfd.h>



struct a2l_data {

	const char 	*input;

	unsigned long 	addr;



	bool 		found;

	const char 	*filename;

	const char 	*funcname;

	unsigned 	line;



	bfd 		*abfd;

	asymbol 	**syms;

};



static int bfd_error(const char *string)

{

	const char *errmsg;



	errmsg = bfd_errmsg(bfd_get_error());

	fflush(stdout);



	if (string)

		pr_debug("%s: %s\n", string, errmsg);

	else

		pr_debug("%s\n", errmsg);



	return -1;

}



static int slurp_symtab(bfd *abfd, struct a2l_data *a2l)

{

	long storage;

	long symcount;

	asymbol **syms;

	bfd_boolean dynamic = FALSE;



	if ((bfd_get_file_flags(abfd) & HAS_SYMS) == 0)

		return bfd_error(bfd_get_filename(abfd));



	storage = bfd_get_symtab_upper_bound(abfd);

	if (storage == 0L) {

		storage = bfd_get_dynamic_symtab_upper_bound(abfd);

		dynamic = TRUE;

	}

	if (storage < 0L)

		return bfd_error(bfd_get_filename(abfd));



	syms = malloc(storage);

	if (dynamic)

		symcount = bfd_canonicalize_dynamic_symtab(abfd, syms);

	else

		symcount = bfd_canonicalize_symtab(abfd, syms);



	if (symcount < 0) {

		free(syms);

		return bfd_error(bfd_get_filename(abfd));

	}



	a2l->syms = syms;

	return 0;

}



static void find_address_in_section(bfd *abfd, asection *section, void *data)

{

	bfd_vma pc, vma;

	bfd_size_type size;

	struct a2l_data *a2l = data;



	if (a2l->found)

		return;



	if ((bfd_get_section_flags(abfd, section) & SEC_ALLOC) == 0)

		return;



	pc = a2l->addr;

	vma = bfd_get_section_vma(abfd, section);

	size = bfd_get_section_size(section);



	if (pc < vma || pc >= vma + size)

		return;



	a2l->found = bfd_find_nearest_line(abfd, section, a2l->syms, pc - vma,

					   &a2l->filename, &a2l->funcname,

					   &a2l->line);

}



static struct a2l_data *addr2line_init(const char *path)

{

	bfd *abfd;

	struct a2l_data *a2l = NULL;



	abfd = bfd_openr(path, NULL);

	if (abfd == NULL)

		return NULL;



	if (!bfd_check_format(abfd, bfd_object))

		goto out;



	a2l = zalloc(sizeof(*a2l));

	if (a2l == NULL)

		goto out;



	a2l->abfd = abfd;

	a2l->input = strdup(path);

	if (a2l->input == NULL)

		goto out;



	if (slurp_symtab(abfd, a2l))

		goto out;



	return a2l;



out:

	if (a2l) {

		free((void *)a2l->input);

		free(a2l);

	}

	bfd_close(abfd);

	return NULL;

}



static void addr2line_cleanup(struct a2l_data *a2l)

{

	if (a2l->abfd)

		bfd_close(a2l->abfd);

	free((void *)a2l->input);

	free(a2l->syms);

	free(a2l);

}



static int addr2line(const char *dso_name, unsigned long addr,

		     char **file, unsigned int *line)

{

	int ret = 0;

	struct a2l_data *a2l;



	a2l = addr2line_init(dso_name);

	if (a2l == NULL) {

		pr_warning("addr2line_init failed for %s\n", dso_name);

		return 0;

	}



	a2l->addr = addr;

	bfd_map_over_sections(a2l->abfd, find_address_in_section, a2l);



	if (a2l->found && a2l->filename) {

		*file = strdup(a2l->filename);

		*line = a2l->line;



		if (*file)

			ret = 1;

	}



	addr2line_cleanup(a2l);

	return ret;

}



#else /* HAVE_LIBBFD_SUPPORT */



static int addr2line(const char *dso_name, unsigned long addr,

		     char **file, unsigned int *line_nr)

{
@@ -53,6 +219,7 @@ static int addr2line(const char *dso_name, unsigned long addr, 
	pclose(fp);

	return ret;

}

#endif /* HAVE_LIBBFD_SUPPORT */



char *get_srcline(struct dso *dso, unsigned long addr)

{