Em Fri, Mar 07, 2014 at 02:19:49PM +0100, Jiri Olsa escreveu: > On Thu, Feb 27, 2014 at 08:22:26PM -0800, Andi Kleen wrote: > > From: Andi Kleen <a...@linux.intel.com> > > SNIP > > > index 8ad97e9..be29bb8 100644 > > --- a/tools/perf/util/callchain.h > > +++ b/tools/perf/util/callchain.h > > @@ -53,6 +53,7 @@ struct callchain_param { > > sort_chain_func_t sort; > > enum chain_order order; > > enum chain_key key; > > + bool branch_callstack; > > }; > > > > struct callchain_list { > > diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c > > index ac37d78..6eff65e 100644 > > --- a/tools/perf/util/machine.c > > +++ b/tools/perf/util/machine.c > > @@ -11,6 +11,7 @@ > > #include <stdbool.h> > > #include <symbol/kallsyms.h> > > #include "unwind.h" > > +#include "linux/hash.h" > > > > int machine__init(struct machine *machine, const char *root_dir, pid_t pid) > > { > > @@ -1192,17 +1193,16 @@ static const u8 cpumodes[] = { > > }; > > #define NCPUMODES (sizeof(cpumodes)/sizeof(u8)) > > > > -static void ip__resolve_ams(struct machine *machine, struct thread *thread, > > - struct addr_map_symbol *ams, > > - u64 ip) > > +static void resolve_branch_ams(struct machine *machine, struct thread > > *thread, > > + u64 ip, > > + struct addr_location *al) > > the function name is confusing.. there's no branch or ams > being dealt with in here
yeah, it should be renamed, and all it does is to try to find something in all the possible cpu modes, so I think we should rename this to: thread__find_cpumode_addr_location() And move it to right after thread__find_addr_location(), then use it here, doing that and combining the other patches, etc, should have it in a place for testing soon. - Arnaldo > maybe something like resolve_ip_al or resolve_ip ? > > jirka -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/