Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752162AbaJOKC0 (ORCPT ); Wed, 15 Oct 2014 06:02:26 -0400 Received: from terminus.zytor.com ([198.137.202.10]:54208 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751539AbaJOKCX (ORCPT ); Wed, 15 Oct 2014 06:02:23 -0400 Date: Wed, 15 Oct 2014 03:02:01 -0700 From: tip-bot for Jiri Olsa Message-ID: Cc: jolsa@kernel.org, hpa@zytor.com, linux-kernel@vger.kernel.org, adrian.hunter@intel.com, fweisbec@gmail.com, acme@redhat.com, cjashfor@linux.vnet.ibm.com, tglx@linutronix.de, mail@milianw.de, a.p.zijlstra@chello.nl, mingo@kernel.org, namhyung@kernel.org, dsahern@gmail.com, paulus@samba.org Reply-To: namhyung@kernel.org, dsahern@gmail.com, a.p.zijlstra@chello.nl, mingo@kernel.org, paulus@samba.org, mail@milianw.de, adrian.hunter@intel.com, cjashfor@linux.vnet.ibm.com, tglx@linutronix.de, acme@redhat.com, fweisbec@gmail.com, hpa@zytor.com, jolsa@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <1412179229-19466-2-git-send-email-jolsa@kernel.org> References: <1412179229-19466-2-git-send-email-jolsa@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/urgent] perf callchain: Move callchain_param to util object in to fix python test Git-Commit-ID: 23aadb1fcda27e79a134ec35a7fb68f243269bcb X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 23aadb1fcda27e79a134ec35a7fb68f243269bcb Gitweb: http://git.kernel.org/tip/23aadb1fcda27e79a134ec35a7fb68f243269bcb Author: Jiri Olsa AuthorDate: Wed, 1 Oct 2014 18:00:26 +0200 Committer: Arnaldo Carvalho de Melo CommitDate: Fri, 3 Oct 2014 09:39:48 -0300 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 Cc: Adrian Hunter Cc: Corey Ashford Cc: David Ahern Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Milian Wolff Cc: Namhyung Kim Cc: Paul Mackerras Cc: Peter Zijlstra Link: http://lkml.kernel.org/r/1412179229-19466-2-git-send-email-jolsa@kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/hist.c | 7 ------- 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 86569fa..b475956 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, 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]; diff --git a/tools/perf/util/util.c b/tools/perf/util/util.c index 24e8d87..d5eab3f 100644 --- a/tools/perf/util/util.c +++ b/tools/perf/util/util.c @@ -14,6 +14,14 @@ #include #include #include +#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... -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/