Browse Source

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: Arnaldo Carvalho de Melo <acme@redhat.com>
Arnaldo Carvalho de Melo 7 years ago
parent
commit
f40dd6d1b4
1 changed files with 2 additions and 5 deletions
  1. 2 5
      tools/perf/util/annotate.c

+ 2 - 5
tools/perf/util/annotate.c

@@ -741,14 +741,11 @@ void symbol__annotate_zero_histograms(struct symbol *sym)
 	pthread_mutex_unlock(&notes->lock);
 	pthread_mutex_unlock(&notes->lock);
 }
 }
 
 
-static int __symbol__account_cycles(struct annotation *notes,
+static int __symbol__account_cycles(struct cyc_hist *ch,
 				    u64 start,
 				    u64 start,
 				    unsigned offset, unsigned cycles,
 				    unsigned offset, unsigned cycles,
 				    unsigned have_start)
 				    unsigned have_start)
 {
 {
-	struct cyc_hist *ch;
-
-	ch = notes->src->cycles_hist;
 	/*
 	/*
 	 * For now we can only account one basic block per
 	 * For now we can only account one basic block per
 	 * final jump. But multiple could be overlapping.
 	 * final jump. But multiple could be overlapping.
@@ -870,7 +867,7 @@ static int symbol__account_cycles(u64 addr, u64 start,
 			start = 0;
 			start = 0;
 	}
 	}
 	offset = addr - sym->start;
 	offset = addr - sym->start;
-	return __symbol__account_cycles(notes,
+	return __symbol__account_cycles(notes->src->cycles_hist,
 					start ? start - sym->start : 0,
 					start ? start - sym->start : 0,
 					offset, cycles,
 					offset, cycles,
 					!!start);
 					!!start);