Commit 9b3726ef authored by Ian Rogers's avatar Ian Rogers Committed by Arnaldo Carvalho de Melo
Browse files

perf annotate: Update use of pthread mutex 



Switch to the use of mutex wrappers that provide better error checking.

Signed-off-by: default avatarIan Rogers <irogers@google.com>
Reviewed-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Acked-by: default avatarNamhyung Kim <namhyung@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Alexandre Truong <alexandre.truong@arm.com>
Cc: Alexey Bayduraev <alexey.v.bayduraev@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Andres Freund <andres@anarazel.de>
Cc: Andrii Nakryiko <andrii@kernel.org>
Cc: André Almeida <andrealmeid@igalia.com>
Cc: Athira Jajeev <atrajeev@linux.vnet.ibm.com>
Cc: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Cc: Colin Ian King <colin.king@intel.com>
Cc: Dario Petrillo <dario.pk1@gmail.com>
Cc: Darren Hart <dvhart@infradead.org>
Cc: Dave Marchevsky <davemarchevsky@fb.com>
Cc: Davidlohr Bueso <dave@stgolabs.net>
Cc: Fangrui Song <maskray@google.com>
Cc: Hewenliang <hewenliang4@huawei.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: James Clark <james.clark@arm.com>
Cc: Jason Wang <wangborong@cdjrlc.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Kajol Jain <kjain@linux.ibm.com>
Cc: Kim Phillips <kim.phillips@amd.com>
Cc: Leo Yan <leo.yan@linaro.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Martin Liška <mliska@suse.cz>
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Nathan Chancellor <nathan@kernel.org>
Cc: Nick Desaulniers <ndesaulniers@google.com>
Cc: Pavithra Gurushankar <gpavithrasha@gmail.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Quentin Monnet <quentin@isovalent.com>
Cc: Ravi Bangoria <ravi.bangoria@amd.com>
Cc: Remi Bernon <rbernon@codeweavers.com>
Cc: Riccardo Mancini <rickyman7@gmail.com>
Cc: Song Liu <songliubraving@fb.com>
Cc: Stephane Eranian <eranian@google.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Thomas Richter <tmricht@linux.ibm.com>
Cc: Tom Rix <trix@redhat.com>
Cc: Weiguo Li <liwg06@foxmail.com>
Cc: Wenyu Liu <liuwenyu7@huawei.com>
Cc: William Cohen <wcohen@redhat.com>
Cc: Zechuan Chen <chenzechuan1@huawei.com>
Cc: bpf@vger.kernel.org
Cc: llvm@lists.linux.dev
Cc: yaowenbin <yaowenbin1@huawei.com>
Link: https://lore.kernel.org/r/20220826164242.43412-13-irogers@google.com


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

tools/perf/builtin-top.c

+7 −7
Original line number Diff line number Diff line
@@ -136,10 +136,10 @@ static int perf_top__parse_source(struct perf_top *top, struct hist_entry *he) 
	}



	notes = symbol__annotation(sym);

	pthread_mutex_lock(&notes->lock);

	mutex_lock(&notes->lock);



	if (!symbol__hists(sym, top->evlist->core.nr_entries)) {

		pthread_mutex_unlock(&notes->lock);

		mutex_unlock(&notes->lock);

		pr_err("Not enough memory for annotating '%s' symbol!\n",

		       sym->name);

		sleep(1);
@@ -155,7 +155,7 @@ static int perf_top__parse_source(struct perf_top *top, struct hist_entry *he) 
		pr_err("Couldn't annotate %s: %s\n", sym->name, msg);

	}



	pthread_mutex_unlock(&notes->lock);

	mutex_unlock(&notes->lock);

	return err;

}
@@ -208,12 +208,12 @@ static void perf_top__record_precise_ip(struct perf_top *top, 


	notes = symbol__annotation(sym);



	if (pthread_mutex_trylock(&notes->lock))

	if (!mutex_trylock(&notes->lock))

		return;



	err = hist_entry__inc_addr_samples(he, sample, evsel, ip);



	pthread_mutex_unlock(&notes->lock);

	mutex_unlock(&notes->lock);



	if (unlikely(err)) {

		/*
@@ -250,7 +250,7 @@ static void perf_top__show_details(struct perf_top *top) 
	symbol = he->ms.sym;

	notes = symbol__annotation(symbol);



	pthread_mutex_lock(&notes->lock);

	mutex_lock(&notes->lock);



	symbol__calc_percent(symbol, evsel);
@@ -271,7 +271,7 @@ static void perf_top__show_details(struct perf_top *top) 
	if (more != 0)

		printf("%d lines not displayed, maybe increase display entries [e]\n", more);

out_unlock:

	pthread_mutex_unlock(&notes->lock);

	mutex_unlock(&notes->lock);

}



static void perf_top__resort_hists(struct perf_top *t)

tools/perf/ui/browsers/annotate.c

+5 −5
Original line number Diff line number Diff line
@@ -319,7 +319,7 @@ static void annotate_browser__calc_percent(struct annotate_browser *browser, 


	browser->entries = RB_ROOT;



	pthread_mutex_lock(&notes->lock);

	mutex_lock(&notes->lock);



	symbol__calc_percent(sym, evsel);
@@ -348,7 +348,7 @@ static void annotate_browser__calc_percent(struct annotate_browser *browser, 
		}

		disasm_rb_tree__insert(browser, &pos->al);

	}

	pthread_mutex_unlock(&notes->lock);

	mutex_unlock(&notes->lock);



	browser->curr_hot = rb_last(&browser->entries);

}
@@ -474,10 +474,10 @@ static bool annotate_browser__callq(struct annotate_browser *browser, 
	}



	notes = symbol__annotation(dl->ops.target.sym);

	pthread_mutex_lock(&notes->lock);

	mutex_lock(&notes->lock);



	if (!symbol__hists(dl->ops.target.sym, evsel->evlist->core.nr_entries)) {

		pthread_mutex_unlock(&notes->lock);

		mutex_unlock(&notes->lock);

		ui__warning("Not enough memory for annotating '%s' symbol!\n",

			    dl->ops.target.sym->name);

		return true;
@@ -486,7 +486,7 @@ static bool annotate_browser__callq(struct annotate_browser *browser, 
	target_ms.maps = ms->maps;

	target_ms.map = ms->map;

	target_ms.sym = dl->ops.target.sym;

	pthread_mutex_unlock(&notes->lock);

	mutex_unlock(&notes->lock);

	symbol__tui_annotate(&target_ms, evsel, hbt, browser->opts);

	sym_title(ms->sym, ms->map, title, sizeof(title), browser->opts->percent_type);

	ui_browser__show_title(&browser->b, title);

tools/perf/util/annotate.c

+6 −7
Original line number Diff line number Diff line
@@ -35,7 +35,6 @@ 
#include "arch/common.h"

#include "namespaces.h"

#include <regex.h>

#include <pthread.h>

#include <linux/bitops.h>

#include <linux/kernel.h>

#include <linux/string.h>
@@ -821,7 +820,7 @@ void symbol__annotate_zero_histograms(struct symbol *sym) 
{

	struct annotation *notes = symbol__annotation(sym);



	pthread_mutex_lock(&notes->lock);

	mutex_lock(&notes->lock);

	if (notes->src != NULL) {

		memset(notes->src->histograms, 0,

		       notes->src->nr_histograms * notes->src->sizeof_sym_hist);
@@ -829,7 +828,7 @@ void symbol__annotate_zero_histograms(struct symbol *sym) 
			memset(notes->src->cycles_hist, 0,

				symbol__size(sym) * sizeof(struct cyc_hist));

	}

	pthread_mutex_unlock(&notes->lock);

	mutex_unlock(&notes->lock);

}



static int __symbol__account_cycles(struct cyc_hist *ch,
@@ -1086,7 +1085,7 @@ void annotation__compute_ipc(struct annotation *notes, size_t size) 
	notes->hit_insn = 0;

	notes->cover_insn = 0;



	pthread_mutex_lock(&notes->lock);

	mutex_lock(&notes->lock);

	for (offset = size - 1; offset >= 0; --offset) {

		struct cyc_hist *ch;
@@ -1105,7 +1104,7 @@ void annotation__compute_ipc(struct annotation *notes, size_t size) 
			notes->have_cycles = true;

		}

	}

	pthread_mutex_unlock(&notes->lock);

	mutex_unlock(&notes->lock);

}



int addr_map_symbol__inc_samples(struct addr_map_symbol *ams, struct perf_sample *sample,
@@ -1258,13 +1257,13 @@ int disasm_line__scnprintf(struct disasm_line *dl, char *bf, size_t size, bool r 


void annotation__init(struct annotation *notes)

{

	pthread_mutex_init(&notes->lock, NULL);

	mutex_init(&notes->lock);

}



void annotation__exit(struct annotation *notes)

{

	annotated_source__delete(notes->src);

	pthread_mutex_destroy(&notes->lock);

	mutex_destroy(&notes->lock);

}



static void annotation_line__add(struct annotation_line *al, struct list_head *head)

tools/perf/util/annotate.h

+2 −2
Original line number Diff line number Diff line
@@ -8,9 +8,9 @@ 
#include <linux/types.h>

#include <linux/list.h>

#include <linux/rbtree.h>

#include <pthread.h>

#include <asm/bug.h>

#include "symbol_conf.h"

#include "mutex.h"

#include "spark.h"



struct hist_browser_timer;
@@ -273,7 +273,7 @@ struct annotated_source { 
};



struct annotation {

	pthread_mutex_t		lock;

	struct mutex lock;

	u64			max_coverage;

	u64			start;

	u64			hit_cycles;