Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f40dd6d1 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

perf annotate: __symbol__acount_cycles doesn't need notes 

It only operates on the notes->src->cyc_hist, just pass that to it.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: https://lkml.kernel.org/n/tip-zd1cu4zwmu21k0cxlr83y6vr@git.kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent e345f3bd

tools/perf/util/annotate.c

+2 −5
Original line number Diff line number Diff line
@@ -741,14 +741,11 @@ void symbol__annotate_zero_histograms(struct symbol *sym) 
	pthread_mutex_unlock(&notes->lock);

}



static int __symbol__account_cycles(struct annotation *notes,

static int __symbol__account_cycles(struct cyc_hist *ch,

				    u64 start,

				    unsigned offset, unsigned cycles,

				    unsigned have_start)

{

	struct cyc_hist *ch;



	ch = notes->src->cycles_hist;

	/*

	 * For now we can only account one basic block per

	 * final jump. But multiple could be overlapping.
@@ -870,7 +867,7 @@ static int symbol__account_cycles(u64 addr, u64 start, 
			start = 0;

	}

	offset = addr - sym->start;

	return __symbol__account_cycles(notes,

	return __symbol__account_cycles(notes->src->cycles_hist,

					start ? start - sym->start : 0,

					offset, cycles,

					!!start);