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

Commit b6e53f32 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'perf-urgent-for-mingo' of... 

Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux

 into perf/urgent

Pull perf/urgent fixes from Arnaldo Carvalho de Melo:

  * Fix annotation on stdio/GTK+ interfaces (Namhyung Kim)

  * Fix file descriptor leaking while searching DSOs for suitable symtab (Namhyung Kim).

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents e3703f8c 98e9f03b

tools/perf/builtin-report.c

+24 −16
Original line number Original line Diff line number Diff line
@@ -113,6 +113,7 @@ static int report__add_mem_hist_entry(struct perf_tool *tool, struct addr_locati 
	if (!he)

	if (!he)

		return -ENOMEM;

		return -ENOMEM;





	if (ui__has_annotation()) {

		err = hist_entry__inc_addr_samples(he, evsel->idx, al->addr);

		err = hist_entry__inc_addr_samples(he, evsel->idx, al->addr);

		if (err)

		if (err)

			goto out;

			goto out;
@@ -121,6 +122,7 @@ static int report__add_mem_hist_entry(struct perf_tool *tool, struct addr_locati 
		err = addr_map_symbol__inc_samples(&mx->daddr, evsel->idx);

		err = addr_map_symbol__inc_samples(&mx->daddr, evsel->idx);

		if (err)

		if (err)

			goto out;

			goto out;

	}





	evsel->hists.stats.total_period += cost;

	evsel->hists.stats.total_period += cost;

	hists__inc_nr_events(&evsel->hists, PERF_RECORD_SAMPLE);

	hists__inc_nr_events(&evsel->hists, PERF_RECORD_SAMPLE);
@@ -164,14 +166,18 @@ static int report__add_branch_hist_entry(struct perf_tool *tool, struct addr_loc 
		he = __hists__add_entry(&evsel->hists, al, parent, &bi[i], NULL,

		he = __hists__add_entry(&evsel->hists, al, parent, &bi[i], NULL,

					1, 1, 0);

					1, 1, 0);

		if (he) {

		if (he) {

			if (ui__has_annotation()) {

				bx = he->branch_info;

				bx = he->branch_info;

			err = addr_map_symbol__inc_samples(&bx->from, evsel->idx);

				err = addr_map_symbol__inc_samples(&bx->from,

								   evsel->idx);

				if (err)

				if (err)

					goto out;

					goto out;





			err = addr_map_symbol__inc_samples(&bx->to, evsel->idx);

				err = addr_map_symbol__inc_samples(&bx->to,

								   evsel->idx);

				if (err)

				if (err)

					goto out;

					goto out;

			}





			evsel->hists.stats.total_period += 1;

			evsel->hists.stats.total_period += 1;

			hists__inc_nr_events(&evsel->hists, PERF_RECORD_SAMPLE);

			hists__inc_nr_events(&evsel->hists, PERF_RECORD_SAMPLE);
@@ -205,7 +211,9 @@ static int report__add_hist_entry(struct perf_tool *tool, struct perf_evsel *evs 
	if (err)

	if (err)

		goto out;

		goto out;





	if (ui__has_annotation())

		err = hist_entry__inc_addr_samples(he, evsel->idx, al->addr);

		err = hist_entry__inc_addr_samples(he, evsel->idx, al->addr);



	evsel->hists.stats.total_period += sample->period;

	evsel->hists.stats.total_period += sample->period;

	hists__inc_nr_events(&evsel->hists, PERF_RECORD_SAMPLE);

	hists__inc_nr_events(&evsel->hists, PERF_RECORD_SAMPLE);

out:

out:

tools/perf/builtin-top.c

+4 −2
Original line number Original line Diff line number Diff line
@@ -176,7 +176,7 @@ static void perf_top__record_precise_ip(struct perf_top *top, 
{

{

	struct annotation *notes;

	struct annotation *notes;

	struct symbol *sym;

	struct symbol *sym;

	int err;

	int err = 0;





	if (he == NULL || he->ms.sym == NULL ||

	if (he == NULL || he->ms.sym == NULL ||

	    ((top->sym_filter_entry == NULL ||

	    ((top->sym_filter_entry == NULL ||
@@ -190,6 +190,8 @@ static void perf_top__record_precise_ip(struct perf_top *top, 
		return;

		return;





	ip = he->ms.map->map_ip(he->ms.map, ip);

	ip = he->ms.map->map_ip(he->ms.map, ip);



	if (ui__has_annotation())

		err = hist_entry__inc_addr_samples(he, counter, ip);

		err = hist_entry__inc_addr_samples(he, counter, ip);





	pthread_mutex_unlock(&notes->lock);

	pthread_mutex_unlock(&notes->lock);

tools/perf/util/annotate.c

+8 −1
Original line number Original line Diff line number Diff line
@@ -8,6 +8,8 @@ 
 */

 */





#include "util.h"

#include "util.h"

#include "ui/ui.h"

#include "sort.h"

#include "build-id.h"

#include "build-id.h"

#include "color.h"

#include "color.h"

#include "cache.h"

#include "cache.h"
@@ -489,7 +491,7 @@ static int symbol__inc_addr_samples(struct symbol *sym, struct map *map, 
{

{

	struct annotation *notes;

	struct annotation *notes;





	if (sym == NULL || use_browser != 1 || !sort__has_sym)

	if (sym == NULL)

		return 0;

		return 0;





	notes = symbol__annotation(sym);

	notes = symbol__annotation(sym);
@@ -1399,3 +1401,8 @@ int hist_entry__annotate(struct hist_entry *he, size_t privsize) 
{

{

	return symbol__annotate(he->ms.sym, he->ms.map, privsize);

	return symbol__annotate(he->ms.sym, he->ms.map, privsize);

}

}



bool ui__has_annotation(void)

{

	return use_browser == 1 && sort__has_sym;

}

tools/perf/util/annotate.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -151,6 +151,8 @@ void symbol__annotate_zero_histogram(struct symbol *sym, int evidx); 
void symbol__annotate_decay_histogram(struct symbol *sym, int evidx);

void symbol__annotate_decay_histogram(struct symbol *sym, int evidx);

void disasm__purge(struct list_head *head);

void disasm__purge(struct list_head *head);





bool ui__has_annotation(void);



int symbol__tty_annotate(struct symbol *sym, struct map *map,

int symbol__tty_annotate(struct symbol *sym, struct map *map,

			 struct perf_evsel *evsel, bool print_lines,

			 struct perf_evsel *evsel, bool print_lines,

			 bool full_paths, int min_pcnt, int max_lines);

			 bool full_paths, int min_pcnt, int max_lines);

tools/perf/util/symbol.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -1336,6 +1336,8 @@ int dso__load(struct dso *dso, struct map *map, symbol_filter_t filter) 




			if (syms_ss && runtime_ss)

			if (syms_ss && runtime_ss)

				break;

				break;

		} else {

			symsrc__destroy(ss);

		}

		}





	}

	}