Commit ce6f4fab authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

perf annotate: Move locking to struct annotation 



Since we'll need it when implementing the live annotate TUI browser.

This also simplifies things a bit by having the list head for the source
code to be in the dynamicly allocated part of struct annotation, that
way we don't have to pass it around, it can be found from the struct
symbol that is passed everywhere.

Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Tom Zanussi <tzanussi@gmail.com>
LKML-Reference: <new-submission>
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent e3087b80

tools/perf/builtin-annotate.c

+8 −6
Original line number Original line Diff line number Diff line
@@ -62,7 +62,8 @@ static int hists__add_entry(struct hists *self, struct addr_location *al) 
		 * All aggregated on the first sym_hist.

		 * All aggregated on the first sym_hist.

		 */

		 */

		struct annotation *notes = symbol__annotation(he->ms.sym);

		struct annotation *notes = symbol__annotation(he->ms.sym);

		if (notes->histograms == NULL && symbol__alloc_hist(he->ms.sym, 1) < 0)

		if (notes->src == NULL &&

		    symbol__alloc_hist(he->ms.sym, 1) < 0)

			return -ENOMEM;

			return -ENOMEM;





		return hist_entry__inc_addr_samples(he, 0, al->addr);

		return hist_entry__inc_addr_samples(he, 0, al->addr);
@@ -77,7 +78,8 @@ static int process_sample_event(union perf_event *event, 
{

{

	struct addr_location al;

	struct addr_location al;





	if (perf_event__preprocess_sample(event, session, &al, sample, NULL) < 0) {

	if (perf_event__preprocess_sample(event, session, &al, sample,

					  symbol__annotate_init) < 0) {

		pr_warning("problem processing %d event, skipping it.\n",

		pr_warning("problem processing %d event, skipping it.\n",

			   event->header.type);

			   event->header.type);

		return -1;

		return -1;
@@ -111,7 +113,7 @@ static void hists__find_annotations(struct hists *self) 
			goto find_next;

			goto find_next;





		notes = symbol__annotation(he->ms.sym);

		notes = symbol__annotation(he->ms.sym);

		if (notes->histograms == NULL) {

		if (notes->src == NULL) {

find_next:

find_next:

			if (key == KEY_LEFT)

			if (key == KEY_LEFT)

				nd = rb_prev(nd);

				nd = rb_prev(nd);
@@ -142,11 +144,11 @@ find_next: 
			nd = rb_next(nd);

			nd = rb_next(nd);

			/*

			/*

			 * Since we have a hist_entry per IP for the same

			 * Since we have a hist_entry per IP for the same

			 * symbol, free he->ms.sym->histogram to signal we already

			 * symbol, free he->ms.sym->src to signal we already

			 * processed this symbol.

			 * processed this symbol.

			 */

			 */

			free(notes->histograms);

			free(notes->src);

			notes->histograms = NULL;

			notes->src = NULL;

		}

		}

	}

	}

}

}

tools/perf/builtin-report.c

+3 −2
Original line number Original line Diff line number Diff line
@@ -123,7 +123,7 @@ static int perf_session__add_hist_entry(struct perf_session *session, 
		 * All aggregated on the first sym_hist.

		 * All aggregated on the first sym_hist.

		 */

		 */

		struct annotation *notes = symbol__annotation(he->ms.sym);

		struct annotation *notes = symbol__annotation(he->ms.sym);

		if (notes->histograms == NULL &&

		if (notes->src == NULL &&

		    symbol__alloc_hist(he->ms.sym, 1) < 0)

		    symbol__alloc_hist(he->ms.sym, 1) < 0)

			err = -ENOMEM;

			err = -ENOMEM;

		else

		else
@@ -166,7 +166,8 @@ static int process_sample_event(union perf_event *event, 
	struct addr_location al;

	struct addr_location al;

	struct perf_event_attr *attr;

	struct perf_event_attr *attr;





	if (perf_event__preprocess_sample(event, session, &al, sample, NULL) < 0) {

	if (perf_event__preprocess_sample(event, session, &al, sample,

					  symbol__annotate_init) < 0) {

		fprintf(stderr, "problem processing %d event, skipping it.\n",

		fprintf(stderr, "problem processing %d event, skipping it.\n",

			event->header.type);

			event->header.type);

		return -1;

		return -1;

tools/perf/builtin-top.c

+34 −33
Original line number Original line Diff line number Diff line
@@ -139,7 +139,7 @@ static void sig_winch_handler(int sig __used) 
static int parse_source(struct sym_entry *syme)

static int parse_source(struct sym_entry *syme)

{

{

	struct symbol *sym;

	struct symbol *sym;

	struct sym_entry_source *source;

	struct annotation *notes;

	struct map *map;

	struct map *map;

	int err = -1;

	int err = -1;
@@ -152,39 +152,35 @@ static int parse_source(struct sym_entry *syme) 
	/*

	/*

	 * We can't annotate with just /proc/kallsyms

	 * We can't annotate with just /proc/kallsyms

	 */

	 */

	if (map->dso->origin == DSO__ORIG_KERNEL)

	if (map->dso->origin == DSO__ORIG_KERNEL) {

		return -1;

		pr_err("Can't annotate %s: No vmlinux file was found in the "



		       "path\n", sym->name);

	if (syme->src == NULL) {

		sleep(1);

		syme->src = zalloc(sizeof(*source));

		if (syme->src == NULL)

		return -1;

		return -1;

		pthread_mutex_init(&syme->src->lock, NULL);

		INIT_LIST_HEAD(&syme->src->head);

	}

	}





	source = syme->src;

	notes = symbol__annotation(sym);



	if (notes->src != NULL) {

	if (symbol__annotation(sym)->histograms != NULL) {

		pthread_mutex_lock(&notes->lock);

		pthread_mutex_lock(&source->lock);

		goto out_assign;

		goto out_assign;

	}

	}





	pthread_mutex_lock(&source->lock);

	pthread_mutex_lock(&notes->lock);





	if (symbol__alloc_hist(sym, top.evlist->nr_entries) < 0) {

	if (symbol__alloc_hist(sym, top.evlist->nr_entries) < 0) {

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

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

		       sym->name);

		       sym->name);

		sleep(1);

		goto out_unlock;

		goto out_unlock;

	}

	}





	err = symbol__annotate(sym, syme->map, &source->head, 0);

	err = symbol__annotate(sym, syme->map, 0);

	if (err == 0) {

	if (err == 0) {

out_assign:

out_assign:

	sym_filter_entry = syme;

	sym_filter_entry = syme;

	}

	}

out_unlock:

out_unlock:

	pthread_mutex_unlock(&source->lock);

	pthread_mutex_unlock(&notes->lock);

	return err;

	return err;

}

}
@@ -196,20 +192,27 @@ static void __zero_source_counters(struct sym_entry *syme) 




static void record_precise_ip(struct sym_entry *syme, int counter, u64 ip)

static void record_precise_ip(struct sym_entry *syme, int counter, u64 ip)

{

{

	struct annotation *notes;

	struct symbol *sym;



	if (syme != sym_filter_entry)

	if (syme != sym_filter_entry)

		return;

		return;





	if (pthread_mutex_trylock(&syme->src->lock))

	sym = sym_entry__symbol(syme);

	notes = symbol__annotation(sym);



	if (pthread_mutex_trylock(&notes->lock))

		return;

		return;





	ip = syme->map->map_ip(syme->map, ip);

	ip = syme->map->map_ip(syme->map, ip);

	symbol__inc_addr_samples(sym_entry__symbol(syme), syme->map, counter, ip);

	symbol__inc_addr_samples(sym, syme->map, counter, ip);





	pthread_mutex_unlock(&syme->src->lock);

	pthread_mutex_unlock(&notes->lock);

}

}





static void show_details(struct sym_entry *syme)

static void show_details(struct sym_entry *syme)

{

{

	struct annotation *notes;

	struct symbol *symbol;

	struct symbol *symbol;

	int more;

	int more;
@@ -217,24 +220,26 @@ static void show_details(struct sym_entry *syme) 
		return;

		return;





	symbol = sym_entry__symbol(syme);

	symbol = sym_entry__symbol(syme);

	if (!syme->src || symbol__annotation(symbol)->histograms == NULL)

	notes = symbol__annotation(symbol);

		return;



	pthread_mutex_lock(&notes->lock);



	if (notes->src == NULL)

		goto out_unlock;





	printf("Showing %s for %s\n", event_name(top.sym_evsel), symbol->name);

	printf("Showing %s for %s\n", event_name(top.sym_evsel), symbol->name);

	printf("  Events  Pcnt (>=%d%%)\n", sym_pcnt_filter);

	printf("  Events  Pcnt (>=%d%%)\n", sym_pcnt_filter);





	pthread_mutex_lock(&syme->src->lock);

	more = symbol__annotate_printf(symbol, syme->map, top.sym_evsel->idx,

	more = symbol__annotate_printf(symbol, syme->map, &syme->src->head,

				       0, sym_pcnt_filter, top.print_entries);

				       top.sym_evsel->idx, 0, sym_pcnt_filter,

				       top.print_entries);

	if (top.zero)

	if (top.zero)

		symbol__annotate_zero_histogram(symbol, top.sym_evsel->idx);

		symbol__annotate_zero_histogram(symbol, top.sym_evsel->idx);

	else

	else

		symbol__annotate_decay_histogram(symbol, &syme->src->head,

		symbol__annotate_decay_histogram(symbol, top.sym_evsel->idx);

						 top.sym_evsel->idx);

	pthread_mutex_unlock(&syme->src->lock);

	if (more != 0)

	if (more != 0)

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

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

out_unlock:

	pthread_mutex_unlock(&notes->lock);

}

}





static const char		CONSOLE_CLEAR[] = "";

static const char		CONSOLE_CLEAR[] = "";
@@ -372,10 +377,8 @@ static void prompt_symbol(struct sym_entry **target, const char *msg) 




	/* zero counters of active symbol */

	/* zero counters of active symbol */

	if (syme) {

	if (syme) {

		pthread_mutex_lock(&syme->src->lock);

		__zero_source_counters(syme);

		__zero_source_counters(syme);

		*target = NULL;

		*target = NULL;

		pthread_mutex_unlock(&syme->src->lock);

	}

	}





	fprintf(stdout, "\n%s: ", msg);

	fprintf(stdout, "\n%s: ", msg);
@@ -554,10 +557,8 @@ static void handle_keypress(struct perf_session *session, int c) 
			else {

			else {

				struct sym_entry *syme = sym_filter_entry;

				struct sym_entry *syme = sym_filter_entry;





				pthread_mutex_lock(&syme->src->lock);

				sym_filter_entry = NULL;

				sym_filter_entry = NULL;

				__zero_source_counters(syme);

				__zero_source_counters(syme);

				pthread_mutex_unlock(&syme->src->lock);

			}

			}

			break;

			break;

		case 'U':

		case 'U':
@@ -653,7 +654,7 @@ static int symbol_filter(struct map *map, struct symbol *sym) 




	syme = symbol__priv(sym);

	syme = symbol__priv(sym);

	syme->map = map;

	syme->map = map;

	syme->src = NULL;

	symbol__annotate_init(map, sym);





	if (!sym_filter_entry && sym_filter && !strcmp(name, sym_filter)) {

	if (!sym_filter_entry && sym_filter && !strcmp(name, sym_filter)) {

		/* schedule initial sym_filter_entry setup */

		/* schedule initial sym_filter_entry setup */

tools/perf/util/annotate.c

+49 −36
Original line number Original line Diff line number Diff line
@@ -14,25 +14,39 @@ 
#include "symbol.h"

#include "symbol.h"

#include "debug.h"

#include "debug.h"

#include "annotate.h"

#include "annotate.h"

#include <pthread.h>





int symbol__alloc_hist(struct symbol *sym, int nevents)

int symbol__annotate_init(struct map *map __used, struct symbol *sym)

{

{

	struct annotation *notes = symbol__annotation(sym);

	struct annotation *notes = symbol__annotation(sym);

	pthread_mutex_init(&notes->lock, NULL);

	return 0;

}





	notes->sizeof_sym_hist = (sizeof(*notes->histograms) +

int symbol__alloc_hist(struct symbol *sym, int nevents)

{

	struct annotation *notes = symbol__annotation(sym);

	size_t sizeof_sym_hist = (sizeof(struct sym_hist) +

				  (sym->end - sym->start) * sizeof(u64));

				  (sym->end - sym->start) * sizeof(u64));

	notes->histograms = calloc(nevents, notes->sizeof_sym_hist);



	notes->nr_histograms = nevents;

	notes->src = zalloc(sizeof(*notes->src) + nevents * sizeof_sym_hist);

	return notes->histograms == NULL ? -1 : 0;

	if (notes->src == NULL)

		return -1;

	notes->src->sizeof_sym_hist = sizeof_sym_hist;

	notes->src->nr_histograms   = nevents;

	INIT_LIST_HEAD(&notes->src->source);

	return 0;

}

}





void symbol__annotate_zero_histograms(struct symbol *sym)

void symbol__annotate_zero_histograms(struct symbol *sym)

{

{

	struct annotation *notes = symbol__annotation(sym);

	struct annotation *notes = symbol__annotation(sym);





	if (notes->histograms != NULL)

	pthread_mutex_lock(&notes->lock);

		memset(notes->histograms, 0,

	if (notes->src != NULL)

		       notes->nr_histograms * notes->sizeof_sym_hist);

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

		       notes->src->nr_histograms * notes->src->sizeof_sym_hist);

	pthread_mutex_unlock(&notes->lock);

}

}





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

int symbol__inc_addr_samples(struct symbol *sym, struct map *map,
@@ -43,7 +57,7 @@ int symbol__inc_addr_samples(struct symbol *sym, struct map *map, 
	struct sym_hist *h;

	struct sym_hist *h;





	notes = symbol__annotation(sym);

	notes = symbol__annotation(sym);

	if (notes->histograms == NULL)

	if (notes->src == NULL)

		return -ENOMEM;

		return -ENOMEM;





	pr_debug3("%s: addr=%#" PRIx64 "\n", __func__, map->unmap_ip(map, addr));

	pr_debug3("%s: addr=%#" PRIx64 "\n", __func__, map->unmap_ip(map, addr));
@@ -95,8 +109,7 @@ struct objdump_line *objdump__get_next_ip_line(struct list_head *head, 
	return NULL;

	return NULL;

}

}





static int objdump_line__print(struct objdump_line *oline,

static int objdump_line__print(struct objdump_line *oline, struct symbol *sym,

			       struct list_head *head, struct symbol *sym,

			       int evidx, u64 len, int min_pcnt,

			       int evidx, u64 len, int min_pcnt,

			       int printed, int max_lines)

			       int printed, int max_lines)

{

{
@@ -109,10 +122,12 @@ static int objdump_line__print(struct objdump_line *oline, 
		double percent = 0.0;

		double percent = 0.0;

		const char *color;

		const char *color;

		struct annotation *notes = symbol__annotation(sym);

		struct annotation *notes = symbol__annotation(sym);

		struct source_line *src_line = notes->src_line;

		struct source_line *src_line = notes->src->lines;

		struct sym_hist *h = annotation__histogram(notes, evidx);

		struct sym_hist *h = annotation__histogram(notes, evidx);

		s64 offset = oline->offset;

		s64 offset = oline->offset;

		struct objdump_line *next = objdump__get_next_ip_line(head, oline);

		struct objdump_line *next;



		next = objdump__get_next_ip_line(&notes->src->source, oline);





		while (offset < (s64)len &&

		while (offset < (s64)len &&

		       (next == NULL || offset < next->offset)) {

		       (next == NULL || offset < next->offset)) {
@@ -166,9 +181,10 @@ static int objdump_line__print(struct objdump_line *oline, 
	return 0;

	return 0;

}

}





static int symbol__parse_objdump_line(struct symbol *sym, struct map *map, FILE *file,

static int symbol__parse_objdump_line(struct symbol *sym, struct map *map,

				      struct list_head *head, size_t privsize)

				      FILE *file, size_t privsize)

{

{

	struct annotation *notes = symbol__annotation(sym);

	struct objdump_line *objdump_line;

	struct objdump_line *objdump_line;

	char *line = NULL, *tmp, *tmp2, *c;

	char *line = NULL, *tmp, *tmp2, *c;

	size_t line_len;

	size_t line_len;
@@ -222,13 +238,12 @@ static int symbol__parse_objdump_line(struct symbol *sym, struct map *map, FILE 
		free(line);

		free(line);

		return -1;

		return -1;

	}

	}

	objdump__add_line(head, objdump_line);

	objdump__add_line(&notes->src->source, objdump_line);





	return 0;

	return 0;

}

}





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

int symbol__annotate(struct symbol *sym, struct map *map, size_t privsize)

		     struct list_head *head, size_t privsize)

{

{

	struct dso *dso = map->dso;

	struct dso *dso = map->dso;

	char *filename = dso__build_id_filename(dso, NULL, 0);

	char *filename = dso__build_id_filename(dso, NULL, 0);
@@ -297,7 +312,7 @@ fallback: 
		goto out_free_filename;

		goto out_free_filename;





	while (!feof(file))

	while (!feof(file))

		if (symbol__parse_objdump_line(sym, map, file, head, privsize) < 0)

		if (symbol__parse_objdump_line(sym, map, file, privsize) < 0)

			break;

			break;





	pclose(file);

	pclose(file);
@@ -330,14 +345,14 @@ static void insert_source_line(struct rb_root *root, struct source_line *src_lin 
static void symbol__free_source_line(struct symbol *sym, int len)

static void symbol__free_source_line(struct symbol *sym, int len)

{

{

	struct annotation *notes = symbol__annotation(sym);

	struct annotation *notes = symbol__annotation(sym);

	struct source_line *src_line = notes->src_line;

	struct source_line *src_line = notes->src->lines;

	int i;

	int i;





	for (i = 0; i < len; i++)

	for (i = 0; i < len; i++)

		free(src_line[i].path);

		free(src_line[i].path);





	free(src_line);

	free(src_line);

	notes->src_line = NULL;

	notes->src->lines = NULL;

}

}





/* Get the filename:line for the colored entries */

/* Get the filename:line for the colored entries */
@@ -355,8 +370,8 @@ static int symbol__get_source_line(struct symbol *sym, struct map *map, 
	if (!h->sum)

	if (!h->sum)

		return 0;

		return 0;





	src_line = notes->src_line = calloc(len, sizeof(struct source_line));

	src_line = notes->src->lines = calloc(len, sizeof(struct source_line));

	if (!notes->src_line)

	if (!notes->src->lines)

		return -1;

		return -1;





	start = map->unmap_ip(map, sym->start);

	start = map->unmap_ip(map, sym->start);
@@ -436,12 +451,12 @@ static void symbol__annotate_hits(struct symbol *sym, int evidx) 
	printf("%*s: %" PRIu64 "\n", BITS_PER_LONG / 2, "h->sum", h->sum);

	printf("%*s: %" PRIu64 "\n", BITS_PER_LONG / 2, "h->sum", h->sum);

}

}





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

int symbol__annotate_printf(struct symbol *sym, struct map *map, int evidx,

			    struct list_head *head, int evidx, bool full_paths,

			    bool full_paths, int min_pcnt, int max_lines)

			    int min_pcnt, int max_lines)

{

{

	struct dso *dso = map->dso;

	struct dso *dso = map->dso;

	const char *filename = dso->long_name, *d_filename;

	const char *filename = dso->long_name, *d_filename;

	struct annotation *notes = symbol__annotation(sym);

	struct objdump_line *pos;

	struct objdump_line *pos;

	int printed = 2;

	int printed = 2;

	int more = 0;

	int more = 0;
@@ -460,8 +475,8 @@ int symbol__annotate_printf(struct symbol *sym, struct map *map, 
	if (verbose)

	if (verbose)

		symbol__annotate_hits(sym, evidx);

		symbol__annotate_hits(sym, evidx);





	list_for_each_entry(pos, head, node) {

	list_for_each_entry(pos, &notes->src->source, node) {

		switch (objdump_line__print(pos, head, sym, evidx, len, min_pcnt,

		switch (objdump_line__print(pos, sym, evidx, len, min_pcnt,

					    printed, max_lines)) {

					    printed, max_lines)) {

		case 0:

		case 0:

			++printed;

			++printed;
@@ -485,11 +500,10 @@ void symbol__annotate_zero_histogram(struct symbol *sym, int evidx) 
	struct annotation *notes = symbol__annotation(sym);

	struct annotation *notes = symbol__annotation(sym);

	struct sym_hist *h = annotation__histogram(notes, evidx);

	struct sym_hist *h = annotation__histogram(notes, evidx);





	memset(h, 0, notes->sizeof_sym_hist);

	memset(h, 0, notes->src->sizeof_sym_hist);

}

}





void symbol__annotate_decay_histogram(struct symbol *sym,

void symbol__annotate_decay_histogram(struct symbol *sym, int evidx)

				      struct list_head *head, int evidx)

{

{

	struct annotation *notes = symbol__annotation(sym);

	struct annotation *notes = symbol__annotation(sym);

	struct sym_hist *h = annotation__histogram(notes, evidx);

	struct sym_hist *h = annotation__histogram(notes, evidx);
@@ -497,7 +511,7 @@ void symbol__annotate_decay_histogram(struct symbol *sym, 




	h->sum = 0;

	h->sum = 0;





	list_for_each_entry(pos, head, node) {

	list_for_each_entry(pos, &notes->src->source, node) {

		if (pos->offset != -1) {

		if (pos->offset != -1) {

			h->addr[pos->offset] = h->addr[pos->offset] * 7 / 8;

			h->addr[pos->offset] = h->addr[pos->offset] * 7 / 8;

			h->sum += h->addr[pos->offset];

			h->sum += h->addr[pos->offset];
@@ -522,10 +536,9 @@ int symbol__tty_annotate(struct symbol *sym, struct map *map, int evidx, 
	struct dso *dso = map->dso;

	struct dso *dso = map->dso;

	const char *filename = dso->long_name;

	const char *filename = dso->long_name;

	struct rb_root source_line = RB_ROOT;

	struct rb_root source_line = RB_ROOT;

	LIST_HEAD(head);

	u64 len;

	u64 len;





	if (symbol__annotate(sym, map, &head, 0) < 0)

	if (symbol__annotate(sym, map, 0) < 0)

		return -1;

		return -1;





	len = sym->end - sym->start;

	len = sym->end - sym->start;
@@ -536,12 +549,12 @@ int symbol__tty_annotate(struct symbol *sym, struct map *map, int evidx, 
		print_summary(&source_line, filename);

		print_summary(&source_line, filename);

	}

	}





	symbol__annotate_printf(sym, map, &head, evidx, full_paths,

	symbol__annotate_printf(sym, map, evidx, full_paths,

				min_pcnt, max_lines);

				min_pcnt, max_lines);

	if (print_lines)

	if (print_lines)

		symbol__free_source_line(sym, len);

		symbol__free_source_line(sym, len);





	objdump_line_list__purge(&head);

	objdump_line_list__purge(&symbol__annotation(sym)->src->source);





	return 0;

	return 0;

}
 
}

tools/perf/util/annotate.h

+20 −14
Original line number Original line Diff line number Diff line
@@ -28,22 +28,29 @@ struct source_line { 
	char		*path;

	char		*path;

};

};





/** struct annotation - symbols with hits have this attached as in sannotation

/** struct annotated_source - symbols with hits have this attached as in sannotation

 *

 *

 * @histogram: Array of addr hit histograms per event being monitored

 * @histogram: Array of addr hit histograms per event being monitored

 * @src_line: If 'print_lines' is specified, per source code line percentages

 * @lines: If 'print_lines' is specified, per source code line percentages

 * @source: source parsed from objdump -dS

 *

 *

 * src_line is allocated, percentages calculated and all sorted by percentage

 * lines is allocated, percentages calculated and all sorted by percentage

 * when the annotation is about to be presented, so the percentages are for

 * when the annotation is about to be presented, so the percentages are for

 * one of the entries in the histogram array, i.e. for the event/counter being

 * one of the entries in the histogram array, i.e. for the event/counter being

 * presented. It is deallocated right after symbol__{tui,tty,etc}_annotate

 * presented. It is deallocated right after symbol__{tui,tty,etc}_annotate

 * returns.

 * returns.

 */

 */

struct annotation {

struct annotated_source {

	struct source_line *src_line;

	struct list_head   source;

	struct sym_hist	   *histograms;

	struct source_line *lines;

	int    		   nr_histograms;

	int    		   nr_histograms;

	int    		   sizeof_sym_hist;

	int    		   sizeof_sym_hist;

	struct sym_hist	   histograms[0];

};



struct annotation {

	pthread_mutex_t		lock;

	struct annotated_source *src;

};

};





struct sannotation {

struct sannotation {
@@ -53,7 +60,8 @@ struct sannotation { 




static inline struct sym_hist *annotation__histogram(struct annotation *notes, int idx)

static inline struct sym_hist *annotation__histogram(struct annotation *notes, int idx)

{

{

	return ((void *)notes->histograms) + (notes->sizeof_sym_hist * idx);

	return (((void *)&notes->src->histograms) +

	 	(notes->src->sizeof_sym_hist * idx));

}

}





static inline struct annotation *symbol__annotation(struct symbol *sym)

static inline struct annotation *symbol__annotation(struct symbol *sym)
@@ -67,14 +75,12 @@ int symbol__inc_addr_samples(struct symbol *sym, struct map *map, 
int symbol__alloc_hist(struct symbol *sym, int nevents);

int symbol__alloc_hist(struct symbol *sym, int nevents);

void symbol__annotate_zero_histograms(struct symbol *sym);

void symbol__annotate_zero_histograms(struct symbol *sym);





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

int symbol__annotate(struct symbol *sym, struct map *map, size_t privsize);

		     struct list_head *head, size_t privsize);

int symbol__annotate_init(struct map *map __used, struct symbol *sym);

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

int symbol__annotate_printf(struct symbol *sym, struct map *map, int evidx,

			    struct list_head *head, int evidx, bool full_paths,

			    bool full_paths, int min_pcnt, int max_lines);

			    int min_pcnt, int max_lines);

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

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

void symbol__annotate_decay_histogram(struct symbol *sym,

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

				      struct list_head *head, int evidx);

void objdump_line_list__purge(struct list_head *head);

void objdump_line_list__purge(struct list_head *head);





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

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

CRA Git | Maintained and supported by SUSTech CRA and CCSE