diff options
author | Jiri Olsa <jolsa@kernel.org> | 2014-10-01 12:00:26 -0400 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2014-10-03 08:39:48 -0400 |
commit | 23aadb1fcda27e79a134ec35a7fb68f243269bcb (patch) | |
tree | 213fafecc6b1fa06131b7296970984cb10860c53 | |
parent | 1ca72260e471a8b03f03fe9a6547deb088710042 (diff) |
perf callchain: Move callchain_param to util object in to fix python test
In following commit we changed the location of callchains data:
72a128aa083a7f4cc4f800718aaae05d9c698e26
perf tools: Move callchain config from record_opts to callchain_param
Now all callchains stuff stays in callchain_param struct, which adds its
dependency for evsel.c object and breaks python perf.so usage
(unresolved callchain_param).
Moving callchain_param into callchain.c and adding it into
python-ext-sources unleash just another dependency hell, so I ended up
adding callchain_param into util.c for now.
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
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: Milian Wolff <mail@milianw.de>
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/1412179229-19466-2-git-send-email-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
-rw-r--r-- | tools/perf/util/hist.c | 7 | ||||
-rw-r--r-- | tools/perf/util/util.c | 8 |
2 files changed, 8 insertions, 7 deletions
diff --git a/tools/perf/util/hist.c b/tools/perf/util/hist.c index 86569fa3651d..b47595697140 100644 --- a/tools/perf/util/hist.c +++ b/tools/perf/util/hist.c | |||
@@ -14,13 +14,6 @@ static bool hists__filter_entry_by_thread(struct hists *hists, | |||
14 | static bool hists__filter_entry_by_symbol(struct hists *hists, | 14 | static bool hists__filter_entry_by_symbol(struct hists *hists, |
15 | struct hist_entry *he); | 15 | struct hist_entry *he); |
16 | 16 | ||
17 | struct callchain_param callchain_param = { | ||
18 | .mode = CHAIN_GRAPH_REL, | ||
19 | .min_percent = 0.5, | ||
20 | .order = ORDER_CALLEE, | ||
21 | .key = CCKEY_FUNCTION | ||
22 | }; | ||
23 | |||
24 | u16 hists__col_len(struct hists *hists, enum hist_column col) | 17 | u16 hists__col_len(struct hists *hists, enum hist_column col) |
25 | { | 18 | { |
26 | return hists->col_len[col]; | 19 | return hists->col_len[col]; |
diff --git a/tools/perf/util/util.c b/tools/perf/util/util.c index 24e8d871b74e..d5eab3f3323f 100644 --- a/tools/perf/util/util.c +++ b/tools/perf/util/util.c | |||
@@ -14,6 +14,14 @@ | |||
14 | #include <byteswap.h> | 14 | #include <byteswap.h> |
15 | #include <linux/kernel.h> | 15 | #include <linux/kernel.h> |
16 | #include <unistd.h> | 16 | #include <unistd.h> |
17 | #include "callchain.h" | ||
18 | |||
19 | struct callchain_param callchain_param = { | ||
20 | .mode = CHAIN_GRAPH_REL, | ||
21 | .min_percent = 0.5, | ||
22 | .order = ORDER_CALLEE, | ||
23 | .key = CCKEY_FUNCTION | ||
24 | }; | ||
17 | 25 | ||
18 | /* | 26 | /* |
19 | * XXX We need to find a better place for these things... | 27 | * XXX We need to find a better place for these things... |