perf annotate: Stop using symbol_conf.nr_events global in symbol__hists()

Since now we have evsel->evlist->nr_entries in the single place calling
this function, use 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-9mgosbqa977h39j4i9ys8t75@git.kernel.orgSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent c6b635ee
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
#include "debug.h" #include "debug.h"
#include "annotate.h" #include "annotate.h"
#include "evsel.h" #include "evsel.h"
#include "evlist.h"
#include "block-range.h" #include "block-range.h"
#include "string2.h" #include "string2.h"
#include "arch/common.h" #include "arch/common.h"
...@@ -867,7 +868,7 @@ static struct cyc_hist *symbol__cycles_hist(struct symbol *sym) ...@@ -867,7 +868,7 @@ static struct cyc_hist *symbol__cycles_hist(struct symbol *sym)
return notes->src->cycles_hist; return notes->src->cycles_hist;
} }
static struct annotated_source *symbol__hists(struct symbol *sym) static struct annotated_source *symbol__hists(struct symbol *sym, int nr_hists)
{ {
struct annotation *notes = symbol__annotation(sym); struct annotation *notes = symbol__annotation(sym);
...@@ -881,7 +882,7 @@ static struct annotated_source *symbol__hists(struct symbol *sym) ...@@ -881,7 +882,7 @@ static struct annotated_source *symbol__hists(struct symbol *sym)
if (notes->src->histograms == NULL) { if (notes->src->histograms == NULL) {
alloc_histograms: alloc_histograms:
annotated_source__alloc_histograms(notes->src, symbol__size(sym), annotated_source__alloc_histograms(notes->src, symbol__size(sym),
symbol_conf.nr_events); nr_hists);
} }
return notes->src; return notes->src;
...@@ -895,7 +896,7 @@ static int symbol__inc_addr_samples(struct symbol *sym, struct map *map, ...@@ -895,7 +896,7 @@ static int symbol__inc_addr_samples(struct symbol *sym, struct map *map,
if (sym == NULL) if (sym == NULL)
return 0; return 0;
src = symbol__hists(sym); src = symbol__hists(sym, evsel->evlist->nr_entries);
if (src == NULL) if (src == NULL)
return -ENOMEM; return -ENOMEM;
return __symbol__inc_addr_samples(sym, map, src, evsel->idx, addr, sample); return __symbol__inc_addr_samples(sym, map, src, evsel->idx, addr, sample);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment