Commit 23aadb1f authored Oct 01, 2014 by Jiri Olsa Committed by Arnaldo Carvalho de Melo Oct 03, 2014

perf callchain: Move callchain_param to util object in to fix python test



In following commit we changed the location of callchains data:

  72a128aa
  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>

parent 1ca72260

tools/perf/util/hist.c

+0 −7

Original line number	Diff line number	Diff line
		@@ -14,13 +14,6 @@ static bool hists__filter_entry_by_thread(struct hists *hists,
		static bool hists__filter_entry_by_symbol(struct hists *hists,
		struct hist_entry *he);

		struct callchain_param callchain_param = {
		.mode = CHAIN_GRAPH_REL,
		.min_percent = 0.5,
		.order = ORDER_CALLEE,
		.key = CCKEY_FUNCTION
		};

		u16 hists__col_len(struct hists *hists, enum hist_column col)
		{
		return hists->col_len[col];

tools/perf/util/util.c

+8 −0

Original line number	Diff line number	Diff line
		@@ -14,6 +14,14 @@
		#include <byteswap.h>
		#include <linux/kernel.h>
		#include <unistd.h>
		#include "callchain.h"

		struct callchain_param callchain_param = {
		.mode = CHAIN_GRAPH_REL,
		.min_percent = 0.5,
		.order = ORDER_CALLEE,
		.key = CCKEY_FUNCTION
		};

		/*
		* XXX We need to find a better place for these things...

Admin message