From f8bd8488de0969827d90642fd5623737bcaa8100 Mon Sep 17 00:00:00 2001 From: Arnaldo Carvalho de Melo Date: Mon, 1 Oct 2012 15:20:58 -0300 Subject: [PATCH] --- yaml --- r: 333951 b: refs/heads/master c: 61eaa3be152afcbfb862a10f81341f96371c3ce3 h: refs/heads/master i: 333949: b00fcbde5cda9e1a71c71c29a4012fbae1421ac8 333947: 45030a13bec3739b91b7ce5aa02d846712caf1e0 333943: e3fb0dfb623294a9f87621dc6acfc78bd267ad70 333935: 9de35a9b1a47d24771287263dd9ddd7c129cc26e 333919: 9baba68fc0165772f54330bd2a723a583b305f40 333887: 0a959c9f2467ca5d925bbf2e5849353f603eb267 333823: 57a241b461ab44410fb256eecf6c0280954c5313 v: v3 --- [refs] | 2 +- trunk/tools/perf/builtin-record.c | 19 ++++++++++--------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 391d53d79644..1e50480b071d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 94d668d0732d469e3237da0990b3512dc0f23d09 +refs/heads/master: 61eaa3be152afcbfb862a10f81341f96371c3ce3 diff --git a/trunk/tools/perf/builtin-record.c b/trunk/tools/perf/builtin-record.c index 8c029fe2e22c..e9231659754d 100644 --- a/trunk/tools/perf/builtin-record.c +++ b/trunk/tools/perf/builtin-record.c @@ -31,15 +31,6 @@ #include #include -#define CALLCHAIN_HELP "do call-graph (stack chain/backtrace) recording: " - -#ifdef LIBUNWIND_SUPPORT -static unsigned long default_stack_dump_size = 8192; -static char callchain_help[] = CALLCHAIN_HELP "[fp] dwarf"; -#else -static char callchain_help[] = CALLCHAIN_HELP "[fp]"; -#endif - enum write_mode_t { WRITE_FORCE, WRITE_APPEND @@ -868,6 +859,8 @@ parse_callchain_opt(const struct option *opt __maybe_unused, const char *arg, #ifdef LIBUNWIND_SUPPORT /* Dwarf style */ } else if (!strncmp(name, "dwarf", sizeof("dwarf"))) { + const unsigned long default_stack_dump_size = 8192; + ret = 0; rec->opts.call_graph = CALLCHAIN_DWARF; rec->opts.stack_dump_size = default_stack_dump_size; @@ -930,6 +923,14 @@ static struct perf_record record = { .file_new = true, }; +#define CALLCHAIN_HELP "do call-graph (stack chain/backtrace) recording: " + +#ifdef LIBUNWIND_SUPPORT +static const char callchain_help[] = CALLCHAIN_HELP "[fp] dwarf"; +#else +static const char callchain_help[] = CALLCHAIN_HELP "[fp]"; +#endif + /* * XXX Will stay a global variable till we fix builtin-script.c to stop messing * with it and switch to use the library functions in perf_evlist that came