Commit 9ff125d1 authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo
Browse files

perf callchain: Introduce HAVE_DWARF_UNWIND_SUPPORT macro 



Introducing global macro HAVE_DWARF_UNWIND_SUPPORT to indicate we have
dwarf unwind support. Any library providing the dwarf post unwind
support will enable this macro.

Signed-off-by: default avatarJiri Olsa <jolsa@redhat.com>
Acked-by: default avatarJean Pihet <jean.pihet@linaro.org>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jean Pihet <jean.pihet@linaro.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1389098853-14466-12-git-send-email-jolsa@redhat.com


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

tools/perf/builtin-record.c

+5 −5
Original line number Diff line number Diff line
@@ -649,7 +649,7 @@ error: 
	return ret;

}



#ifdef HAVE_LIBUNWIND_SUPPORT

#ifdef HAVE_DWARF_UNWIND_SUPPORT

static int get_stack_size(char *str, unsigned long *_size)

{

	char *endptr;
@@ -675,7 +675,7 @@ static int get_stack_size(char *str, unsigned long *_size) 
	       max_size, str);

	return -1;

}

#endif /* HAVE_LIBUNWIND_SUPPORT */

#endif /* HAVE_DWARF_UNWIND_SUPPORT */



int record_parse_callchain(const char *arg, struct record_opts *opts)

{
@@ -704,7 +704,7 @@ int record_parse_callchain(const char *arg, struct record_opts *opts) 
				       "needed for -g fp\n");

			break;



#ifdef HAVE_LIBUNWIND_SUPPORT

#ifdef HAVE_DWARF_UNWIND_SUPPORT

		/* Dwarf style */

		} else if (!strncmp(name, "dwarf", sizeof("dwarf"))) {

			const unsigned long default_stack_dump_size = 8192;
@@ -720,7 +720,7 @@ int record_parse_callchain(const char *arg, struct record_opts *opts) 
				ret = get_stack_size(tok, &size);

				opts->stack_dump_size = size;

			}

#endif /* HAVE_LIBUNWIND_SUPPORT */

#endif /* HAVE_DWARF_UNWIND_SUPPORT */

		} else {

			pr_err("callchain: Unknown --call-graph option "

			       "value: %s\n", arg);
@@ -823,7 +823,7 @@ static struct record record = { 


#define CALLCHAIN_HELP "setup and enables call-graph (stack chain/backtrace) recording: "



#ifdef HAVE_LIBUNWIND_SUPPORT

#ifdef HAVE_DWARF_UNWIND_SUPPORT

const char record_callchain_help[] = CALLCHAIN_HELP "fp dwarf";

#else

const char record_callchain_help[] = CALLCHAIN_HELP "fp";

tools/perf/config/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -338,7 +338,7 @@ ifndef NO_LIBUNWIND 
      CFLAGS += -DNO_LIBUNWIND_DEBUG_FRAME

    endif



    CFLAGS += -DHAVE_LIBUNWIND_SUPPORT

    CFLAGS += -DHAVE_DWARF_UNWIND_SUPPORT -DHAVE_LIBUNWIND_SUPPORT

    EXTLIBS += $(LIBUNWIND_LIBS)

    CFLAGS += $(LIBUNWIND_CFLAGS)

    LDFLAGS += $(LIBUNWIND_LDFLAGS)

tools/perf/tests/builtin-test.c

+1 −1
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ static struct test { 
		.func = test__parse_no_sample_id_all,

	},

#if defined(__x86_64__) || defined(__i386__)

#ifdef HAVE_LIBUNWIND_SUPPORT

#ifdef HAVE_DWARF_UNWIND_SUPPORT

	{

		.desc = "Test dwarf unwind",

		.func = test__dwarf_unwind,

tools/perf/tests/tests.h

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ int test__parse_no_sample_id_all(void); 
int test__dwarf_unwind(void);



#if defined(__x86_64__) || defined(__i386__)

#ifdef HAVE_LIBUNWIND_SUPPORT

#ifdef HAVE_DWARF_UNWIND_SUPPORT

struct thread;

struct perf_sample;

int test__arch_unwind_sample(struct perf_sample *sample,

tools/perf/util/unwind.h

+5 −2
Original line number Diff line number Diff line
@@ -13,12 +13,15 @@ struct unwind_entry { 


typedef int (*unwind_entry_cb_t)(struct unwind_entry *entry, void *arg);



#ifdef HAVE_LIBUNWIND_SUPPORT

#ifdef HAVE_DWARF_UNWIND_SUPPORT

int unwind__get_entries(unwind_entry_cb_t cb, void *arg,

			struct machine *machine,

			struct thread *thread,

			struct perf_sample *data, int max_stack);

/* libunwind specific */

#ifdef HAVE_LIBUNWIND_SUPPORT

int libunwind__arch_reg_id(int regnum);

#endif

#else

static inline int

unwind__get_entries(unwind_entry_cb_t cb __maybe_unused,
@@ -30,5 +33,5 @@ unwind__get_entries(unwind_entry_cb_t cb __maybe_unused, 
{

	return 0;

}

#endif /* HAVE_LIBUNWIND_SUPPORT */

#endif /* HAVE_DWARF_UNWIND_SUPPORT */

#endif /* __UNWIND_H */

CRA Git | Maintained and supported by SUSTech CRA and CCSE