diff options
Diffstat (limited to 'tools/perf/util/ui/browsers/annotate.c')
-rw-r--r-- | tools/perf/util/ui/browsers/annotate.c | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/tools/perf/util/ui/browsers/annotate.c b/tools/perf/util/ui/browsers/annotate.c index 0575905d120..295a9c93f94 100644 --- a/tools/perf/util/ui/browsers/annotate.c +++ b/tools/perf/util/ui/browsers/annotate.c | |||
@@ -224,7 +224,7 @@ static bool annotate_browser__toggle_source(struct annotate_browser *browser) | |||
224 | } | 224 | } |
225 | 225 | ||
226 | static int annotate_browser__run(struct annotate_browser *self, int evidx, | 226 | static int annotate_browser__run(struct annotate_browser *self, int evidx, |
227 | int nr_events, void(*timer)(void *arg), | 227 | void(*timer)(void *arg), |
228 | void *arg, int delay_secs) | 228 | void *arg, int delay_secs) |
229 | { | 229 | { |
230 | struct rb_node *nd = NULL; | 230 | struct rb_node *nd = NULL; |
@@ -328,8 +328,7 @@ static int annotate_browser__run(struct annotate_browser *self, int evidx, | |||
328 | notes = symbol__annotation(target); | 328 | notes = symbol__annotation(target); |
329 | pthread_mutex_lock(¬es->lock); | 329 | pthread_mutex_lock(¬es->lock); |
330 | 330 | ||
331 | if (notes->src == NULL && | 331 | if (notes->src == NULL && symbol__alloc_hist(target) < 0) { |
332 | symbol__alloc_hist(target, nr_events) < 0) { | ||
333 | pthread_mutex_unlock(¬es->lock); | 332 | pthread_mutex_unlock(¬es->lock); |
334 | ui__warning("Not enough memory for annotating '%s' symbol!\n", | 333 | ui__warning("Not enough memory for annotating '%s' symbol!\n", |
335 | target->name); | 334 | target->name); |
@@ -337,7 +336,7 @@ static int annotate_browser__run(struct annotate_browser *self, int evidx, | |||
337 | } | 336 | } |
338 | 337 | ||
339 | pthread_mutex_unlock(¬es->lock); | 338 | pthread_mutex_unlock(¬es->lock); |
340 | symbol__tui_annotate(target, ms->map, evidx, nr_events, | 339 | symbol__tui_annotate(target, ms->map, evidx, |
341 | timer, arg, delay_secs); | 340 | timer, arg, delay_secs); |
342 | } | 341 | } |
343 | continue; | 342 | continue; |
@@ -358,15 +357,15 @@ out: | |||
358 | return key; | 357 | return key; |
359 | } | 358 | } |
360 | 359 | ||
361 | int hist_entry__tui_annotate(struct hist_entry *he, int evidx, int nr_events, | 360 | int hist_entry__tui_annotate(struct hist_entry *he, int evidx, |
362 | void(*timer)(void *arg), void *arg, int delay_secs) | 361 | void(*timer)(void *arg), void *arg, int delay_secs) |
363 | { | 362 | { |
364 | return symbol__tui_annotate(he->ms.sym, he->ms.map, evidx, nr_events, | 363 | return symbol__tui_annotate(he->ms.sym, he->ms.map, evidx, |
365 | timer, arg, delay_secs); | 364 | timer, arg, delay_secs); |
366 | } | 365 | } |
367 | 366 | ||
368 | int symbol__tui_annotate(struct symbol *sym, struct map *map, int evidx, | 367 | int symbol__tui_annotate(struct symbol *sym, struct map *map, int evidx, |
369 | int nr_events, void(*timer)(void *arg), void *arg, | 368 | void(*timer)(void *arg), void *arg, |
370 | int delay_secs) | 369 | int delay_secs) |
371 | { | 370 | { |
372 | struct objdump_line *pos, *n; | 371 | struct objdump_line *pos, *n; |
@@ -419,8 +418,7 @@ int symbol__tui_annotate(struct symbol *sym, struct map *map, int evidx, | |||
419 | browser.b.nr_entries = browser.nr_entries; | 418 | browser.b.nr_entries = browser.nr_entries; |
420 | browser.b.entries = ¬es->src->source, | 419 | browser.b.entries = ¬es->src->source, |
421 | browser.b.width += 18; /* Percentage */ | 420 | browser.b.width += 18; /* Percentage */ |
422 | ret = annotate_browser__run(&browser, evidx, nr_events, | 421 | ret = annotate_browser__run(&browser, evidx, timer, arg, delay_secs); |
423 | timer, arg, delay_secs); | ||
424 | list_for_each_entry_safe(pos, n, ¬es->src->source, node) { | 422 | list_for_each_entry_safe(pos, n, ¬es->src->source, node) { |
425 | list_del(&pos->node); | 423 | list_del(&pos->node); |
426 | objdump_line__free(pos); | 424 | objdump_line__free(pos); |