Messages in this thread Patch in this message | | | Date | Thu, 2 Oct 2014 17:08:27 +0200 | From | Jiri Olsa <> | Subject | Re: [PATCH 2/5] perf tools: Move callchain_param to util object in to fix python test |
| |
On Thu, Oct 02, 2014 at 11:59:49AM -0300, Arnaldo Carvalho de Melo wrote: > Em Wed, Oct 01, 2014 at 06:00:26PM +0200, Jiri Olsa escreveu: > > In following commit we changed the location of callchains data: > > b016b5ba554b 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. > > Against what branch is the patch? I am not finding b016b5ba554b in none
[jolsa@krava perf]$ git describe --contains b016b5ba554b fatal: cannot describe 'b016b5ba554ba38c74241ef8739f8fde8878d3eb' [jolsa@krava perf]$ git show --oneline b016b5ba554b | head -1 b016b5ba554b perf tools: Move callchain config from record_opts to callchain_param [jolsa@krava perf]$ git show 72a128aa083a > /tmp/p [jolsa@krava perf]$ git show b016b5ba554b > /tmp/p1 [jolsa@krava perf]$ diff -puw /tmp/p /tmp/p1 --- /tmp/p 2014-10-02 17:06:20.072958720 +0200 +++ /tmp/p1 2014-10-02 17:06:26.035946113 +0200 @@ -1,4 +1,4 @@ -commit 72a128aa083a7f4cc4f800718aaae05d9c698e26 +commit b016b5ba554ba38c74241ef8739f8fde8878d3eb Author: Namhyung Kim <namhyung@kernel.org> Date: Tue Sep 23 10:01:41 2014 +0900
I guess I took some version before your rebase
> of the branches in my linux git repo and the python 'perf test' entry > works as expected: > > [root@zoo ~]# perf test python > 17: Try 'use perf' in python, checking link problems : Ok > [root@zoo ~]#
hum.. yours acme/perf/core is failing for me:
[jolsa@krava perf]$ ./perf test python 17: Try 'use perf' in python, checking link problems : FAILED! [jolsa@krava perf]$ git show --oneline HEAD | head -1 281f92f233a5 perf record: Fix error message for --filter option not coming after tracepoint maybe you need 'make clean && make' ?
jirka
> > - Arnaldo > > > Cc: Adrian Hunter <adrian.hunter@intel.com> > > Cc: Arnaldo Carvalho de Melo <acme@redhat.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> > > Signed-off-by: Jiri Olsa <jolsa@kernel.org> > > --- > > 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 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, > > 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 24e8d871b74e..d5eab3f3323f 100644 > > --- a/tools/perf/util/util.c > > +++ b/tools/perf/util/util.c > > @@ -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... > > -- > > 1.9.3 > > > > -- > > 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/
| |