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

perf evsel: Move some methods from session.[ch] to evsel.[ch] 

Those were converted to be evsel methods long ago, move the
source to where it belongs.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Milian Wolff <milian.wolff@kdab.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/n/tip-vja8rjmkw3gd5ungaeyb5s2j@git.kernel.org


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

tools/perf/builtin-script.c

+7 −7
Original line number Diff line number Diff line
@@ -317,19 +317,19 @@ static void set_print_ip_opts(struct perf_event_attr *attr) 


	output[type].print_ip_opts = 0;

	if (PRINT_FIELD(IP))

		output[type].print_ip_opts |= PRINT_IP_OPT_IP;

		output[type].print_ip_opts |= EVSEL__PRINT_IP;



	if (PRINT_FIELD(SYM))

		output[type].print_ip_opts |= PRINT_IP_OPT_SYM;

		output[type].print_ip_opts |= EVSEL__PRINT_SYM;



	if (PRINT_FIELD(DSO))

		output[type].print_ip_opts |= PRINT_IP_OPT_DSO;

		output[type].print_ip_opts |= EVSEL__PRINT_DSO;



	if (PRINT_FIELD(SYMOFFSET))

		output[type].print_ip_opts |= PRINT_IP_OPT_SYMOFFSET;

		output[type].print_ip_opts |= EVSEL__PRINT_SYMOFFSET;



	if (PRINT_FIELD(SRCLINE))

		output[type].print_ip_opts |= PRINT_IP_OPT_SRCLINE;

		output[type].print_ip_opts |= EVSEL__PRINT_SRCLINE;

}



/*
@@ -574,9 +574,9 @@ static void print_sample_bts(struct perf_sample *sample, 
			printf("\n");

		} else {

			printf(" ");

			if (print_opts & PRINT_IP_OPT_SRCLINE) {

			if (print_opts & EVSEL__PRINT_SRCLINE) {

				print_srcline_last = true;

				print_opts &= ~PRINT_IP_OPT_SRCLINE;

				print_opts &= ~EVSEL__PRINT_SRCLINE;

			}

		}

		perf_evsel__fprintf_sym(evsel, sample, al, 0, print_opts,

tools/perf/builtin-trace.c

+3 −3
Original line number Diff line number Diff line
@@ -2119,9 +2119,9 @@ static int trace__fprintf_callchain(struct trace *trace, struct perf_evsel *evse 
{

	struct addr_location al;

	/* TODO: user-configurable print_opts */

	const unsigned int print_opts = PRINT_IP_OPT_SYM |

				        PRINT_IP_OPT_DSO |

				        PRINT_IP_OPT_UNKNOWN_AS_ADDR;

	const unsigned int print_opts = EVSEL__PRINT_SYM |

				        EVSEL__PRINT_DSO |

				        EVSEL__PRINT_UNKNOWN_AS_ADDR;



	if (sample->callchain == NULL)

		return 0;

tools/perf/util/evsel.c

+131 −0
Original line number Diff line number Diff line
@@ -2343,6 +2343,137 @@ out: 
	return ++printed;

}



int perf_evsel__fprintf_callchain(struct perf_evsel *evsel, struct perf_sample *sample,

				  struct addr_location *al, int left_alignment,

				  unsigned int print_opts, unsigned int stack_depth,

				  FILE *fp)

{

	int printed = 0;

	struct callchain_cursor_node *node;

	int print_ip = print_opts & EVSEL__PRINT_IP;

	int print_sym = print_opts & EVSEL__PRINT_SYM;

	int print_dso = print_opts & EVSEL__PRINT_DSO;

	int print_symoffset = print_opts & EVSEL__PRINT_SYMOFFSET;

	int print_oneline = print_opts & EVSEL__PRINT_ONELINE;

	int print_srcline = print_opts & EVSEL__PRINT_SRCLINE;

	int print_unknown_as_addr = print_opts & EVSEL__PRINT_UNKNOWN_AS_ADDR;

	char s = print_oneline ? ' ' : '\t';



	if (sample->callchain) {

		struct addr_location node_al;



		if (thread__resolve_callchain(al->thread, evsel,

					      sample, NULL, NULL,

					      stack_depth) != 0) {

			if (verbose)

				error("Failed to resolve callchain. Skipping\n");

			return printed;

		}

		callchain_cursor_commit(&callchain_cursor);



		if (print_symoffset)

			node_al = *al;



		while (stack_depth) {

			u64 addr = 0;



			node = callchain_cursor_current(&callchain_cursor);

			if (!node)

				break;



			if (node->sym && node->sym->ignore)

				goto next;



			printed += fprintf(fp, "%-*.*s", left_alignment, left_alignment, " ");



			if (print_ip)

				printed += fprintf(fp, "%c%16" PRIx64, s, node->ip);



			if (node->map)

				addr = node->map->map_ip(node->map, node->ip);



			if (print_sym) {

				printed += fprintf(fp, " ");

				node_al.addr = addr;

				node_al.map  = node->map;



				if (print_symoffset) {

					printed += __symbol__fprintf_symname_offs(node->sym, &node_al,

										  print_unknown_as_addr, fp);

				} else {

					printed += __symbol__fprintf_symname(node->sym, &node_al,

									     print_unknown_as_addr, fp);

				}

			}



			if (print_dso) {

				printed += fprintf(fp, " (");

				printed += map__fprintf_dsoname(node->map, fp);

				printed += fprintf(fp, ")");

			}



			if (print_srcline)

				printed += map__fprintf_srcline(node->map, addr, "\n  ", fp);



			if (!print_oneline)

				printed += fprintf(fp, "\n");



			stack_depth--;

next:

			callchain_cursor_advance(&callchain_cursor);

		}

	}



	return printed;

}



int perf_evsel__fprintf_sym(struct perf_evsel *evsel, struct perf_sample *sample,

			    struct addr_location *al, int left_alignment,

			    unsigned int print_opts, unsigned int stack_depth,

			    FILE *fp)

{

	int printed = 0;

	int print_ip = print_opts & EVSEL__PRINT_IP;

	int print_sym = print_opts & EVSEL__PRINT_SYM;

	int print_dso = print_opts & EVSEL__PRINT_DSO;

	int print_symoffset = print_opts & EVSEL__PRINT_SYMOFFSET;

	int print_srcline = print_opts & EVSEL__PRINT_SRCLINE;

	int print_unknown_as_addr = print_opts & EVSEL__PRINT_UNKNOWN_AS_ADDR;



	if (symbol_conf.use_callchain && sample->callchain) {

		printed += perf_evsel__fprintf_callchain(evsel, sample, al, left_alignment,

							 print_opts, stack_depth, fp);

	} else if (!(al->sym && al->sym->ignore)) {

		printed += fprintf(fp, "%-*.*s", left_alignment, left_alignment, " ");



		if (print_ip)

			printed += fprintf(fp, "%16" PRIx64, sample->ip);



		if (print_sym) {

			printed += fprintf(fp, " ");

			if (print_symoffset) {

				printed += __symbol__fprintf_symname_offs(al->sym, al,

									  print_unknown_as_addr, fp);

			} else {

				printed += __symbol__fprintf_symname(al->sym, al,

								     print_unknown_as_addr, fp);

			}

		}



		if (print_dso) {

			printed += fprintf(fp, " (");

			printed += map__fprintf_dsoname(al->map, fp);

			printed += fprintf(fp, ")");

		}



		if (print_srcline)

			printed += map__fprintf_srcline(al->map, al->addr, "\n  ", fp);

	}



	return printed;

}





bool perf_evsel__fallback(struct perf_evsel *evsel, int err,

			  char *msg, size_t msgsize)

{

tools/perf/util/evsel.h

+13 −0
Original line number Diff line number Diff line
@@ -387,12 +387,25 @@ struct perf_attr_details { 
int perf_evsel__fprintf(struct perf_evsel *evsel,

			struct perf_attr_details *details, FILE *fp);



#define EVSEL__PRINT_IP			(1<<0)

#define EVSEL__PRINT_SYM		(1<<1)

#define EVSEL__PRINT_DSO		(1<<2)

#define EVSEL__PRINT_SYMOFFSET		(1<<3)

#define EVSEL__PRINT_ONELINE		(1<<4)

#define EVSEL__PRINT_SRCLINE		(1<<5)

#define EVSEL__PRINT_UNKNOWN_AS_ADDR	(1<<6)



int perf_evsel__fprintf_callchain(struct perf_evsel *evsel,

				  struct perf_sample *sample,

				  struct addr_location *al, int left_alignment,

				  unsigned int print_opts,

				  unsigned int stack_depth, FILE *fp);



int perf_evsel__fprintf_sym(struct perf_evsel *evsel, struct perf_sample *sample,

			    struct addr_location *al, int left_alignment,

			    unsigned int print_opts, unsigned int stack_depth,

			    FILE *fp);



bool perf_evsel__fallback(struct perf_evsel *evsel, int err,

			  char *msg, size_t msgsize);

int perf_evsel__open_strerror(struct perf_evsel *evsel, struct target *target,

tools/perf/util/session.c

+0 −130
Original line number Diff line number Diff line
@@ -1953,136 +1953,6 @@ struct perf_evsel *perf_session__find_first_evtype(struct perf_session *session, 
	return NULL;

}



int perf_evsel__fprintf_callchain(struct perf_evsel *evsel, struct perf_sample *sample,

				  struct addr_location *al, int left_alignment,

				  unsigned int print_opts, unsigned int stack_depth,

				  FILE *fp)

{

	int printed = 0;

	struct callchain_cursor_node *node;

	int print_ip = print_opts & PRINT_IP_OPT_IP;

	int print_sym = print_opts & PRINT_IP_OPT_SYM;

	int print_dso = print_opts & PRINT_IP_OPT_DSO;

	int print_symoffset = print_opts & PRINT_IP_OPT_SYMOFFSET;

	int print_oneline = print_opts & PRINT_IP_OPT_ONELINE;

	int print_srcline = print_opts & PRINT_IP_OPT_SRCLINE;

	int print_unknown_as_addr = print_opts & PRINT_IP_OPT_UNKNOWN_AS_ADDR;

	char s = print_oneline ? ' ' : '\t';



	if (sample->callchain) {

		struct addr_location node_al;



		if (thread__resolve_callchain(al->thread, evsel,

					      sample, NULL, NULL,

					      stack_depth) != 0) {

			if (verbose)

				error("Failed to resolve callchain. Skipping\n");

			return printed;

		}

		callchain_cursor_commit(&callchain_cursor);



		if (print_symoffset)

			node_al = *al;



		while (stack_depth) {

			u64 addr = 0;



			node = callchain_cursor_current(&callchain_cursor);

			if (!node)

				break;



			if (node->sym && node->sym->ignore)

				goto next;



			printed += fprintf(fp, "%-*.*s", left_alignment, left_alignment, " ");



			if (print_ip)

				printed += fprintf(fp, "%c%16" PRIx64, s, node->ip);



			if (node->map)

				addr = node->map->map_ip(node->map, node->ip);



			if (print_sym) {

				printed += fprintf(fp, " ");

				node_al.addr = addr;

				node_al.map  = node->map;



				if (print_symoffset) {

					printed += __symbol__fprintf_symname_offs(node->sym, &node_al,

										  print_unknown_as_addr, fp);

				} else {

					printed += __symbol__fprintf_symname(node->sym, &node_al,

									     print_unknown_as_addr, fp);

				}

			}



			if (print_dso) {

				printed += fprintf(fp, " (");

				printed += map__fprintf_dsoname(node->map, fp);

				printed += fprintf(fp, ")");

			}



			if (print_srcline)

				printed += map__fprintf_srcline(node->map, addr, "\n  ", fp);



			if (!print_oneline)

				printed += fprintf(fp, "\n");



			stack_depth--;

next:

			callchain_cursor_advance(&callchain_cursor);

		}

	}



	return printed;

}



int perf_evsel__fprintf_sym(struct perf_evsel *evsel, struct perf_sample *sample,

			    struct addr_location *al, int left_alignment,

			    unsigned int print_opts, unsigned int stack_depth,

			    FILE *fp)

{

	int printed = 0;

	int print_ip = print_opts & PRINT_IP_OPT_IP;

	int print_sym = print_opts & PRINT_IP_OPT_SYM;

	int print_dso = print_opts & PRINT_IP_OPT_DSO;

	int print_symoffset = print_opts & PRINT_IP_OPT_SYMOFFSET;

	int print_srcline = print_opts & PRINT_IP_OPT_SRCLINE;

	int print_unknown_as_addr = print_opts & PRINT_IP_OPT_UNKNOWN_AS_ADDR;



	if (symbol_conf.use_callchain && sample->callchain) {

		printed += perf_evsel__fprintf_callchain(evsel, sample, al, left_alignment,

							 print_opts, stack_depth, fp);

	} else if (!(al->sym && al->sym->ignore)) {

		printed += fprintf(fp, "%-*.*s", left_alignment, left_alignment, " ");



		if (print_ip)

			printed += fprintf(fp, "%16" PRIx64, sample->ip);



		if (print_sym) {

			printed += fprintf(fp, " ");

			if (print_symoffset) {

				printed += __symbol__fprintf_symname_offs(al->sym, al,

									  print_unknown_as_addr, fp);

			} else {

				printed += __symbol__fprintf_symname(al->sym, al,

								     print_unknown_as_addr, fp);

			}

		}



		if (print_dso) {

			printed += fprintf(fp, " (");

			printed += map__fprintf_dsoname(al->map, fp);

			printed += fprintf(fp, ")");

		}



		if (print_srcline)

			printed += map__fprintf_srcline(al->map, al->addr, "\n  ", fp);

	}



	return printed;

}



int perf_session__cpu_bitmap(struct perf_session *session,

			     const char *cpu_list, unsigned long *cpu_bitmap)

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE