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

Commit a6ffaf91 authored by David Ahern's avatar David Ahern Committed by Arnaldo Carvalho de Melo
Browse files

perf tool: Simplify options to perf_evsel__print_ip 



Make print options based on flags. Simplifies addition of more print
options which is the subject of upcoming patches.

Signed-off-by: default avatarDavid Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/1375930261-77273-10-git-send-email-dsahern@gmail.com


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

tools/perf/builtin-script.c

+23 −4
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ struct output_option { 
static struct {

	bool user_set;

	bool wildcard_set;

	unsigned int print_ip_opts;

	u64 fields;

	u64 invalid_fields;

} output[PERF_TYPE_MAX] = {
@@ -235,6 +236,7 @@ static int perf_session__check_output_opt(struct perf_session *session) 
{

	int j;

	struct perf_evsel *evsel;

	struct perf_event_attr *attr;



	for (j = 0; j < PERF_TYPE_MAX; ++j) {

		evsel = perf_session__find_first_evtype(session, j);
@@ -253,6 +255,24 @@ static int perf_session__check_output_opt(struct perf_session *session) 
		if (evsel && output[j].fields &&

			perf_evsel__check_attr(evsel, session))

			return -1;



		if (evsel == NULL)

			continue;



		attr = &evsel->attr;



		output[j].print_ip_opts = 0;

		if (PRINT_FIELD(IP))

			output[j].print_ip_opts |= PRINT_IP_OPT_IP;



		if (PRINT_FIELD(SYM))

			output[j].print_ip_opts |= PRINT_IP_OPT_SYM;



		if (PRINT_FIELD(DSO))

			output[j].print_ip_opts |= PRINT_IP_OPT_DSO;



		if (PRINT_FIELD(SYMOFFSET))

			output[j].print_ip_opts |= PRINT_IP_OPT_SYMOFFSET;

	}



	return 0;
@@ -382,8 +402,7 @@ static void print_sample_bts(union perf_event *event, 
		else

			printf("\n");

		perf_evsel__print_ip(evsel, event, sample, machine,

				     PRINT_FIELD(SYM), PRINT_FIELD(DSO),

				     PRINT_FIELD(SYMOFFSET));

				     output[attr->type].print_ip_opts);

	}



	printf(" => ");
@@ -423,9 +442,9 @@ static void process_event(union perf_event *event, struct perf_sample *sample, 
			printf(" ");

		else

			printf("\n");



		perf_evsel__print_ip(evsel, event, sample, machine,

				     PRINT_FIELD(SYM), PRINT_FIELD(DSO),

				     PRINT_FIELD(SYMOFFSET));

				     output[attr->type].print_ip_opts);

	}



	printf("\n");

tools/perf/util/session.c

+11 −3
Original line number Diff line number Diff line
@@ -1489,10 +1489,14 @@ struct perf_evsel *perf_session__find_first_evtype(struct perf_session *session, 


void perf_evsel__print_ip(struct perf_evsel *evsel, union perf_event *event,

			  struct perf_sample *sample, struct machine *machine,

			  int print_sym, int print_dso, int print_symoffset)

			  unsigned int print_opts)

{

	struct addr_location al;

	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;



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

					  NULL) < 0) {
@@ -1516,7 +1520,9 @@ void perf_evsel__print_ip(struct perf_evsel *evsel, union perf_event *event, 
			if (!node)

				break;



			printf("\t%16" PRIx64, node->ip);

			if (print_ip)

				printf("%16" PRIx64, node->ip);



			if (print_sym) {

				printf(" ");

				if (print_symoffset) {
@@ -1537,7 +1543,9 @@ void perf_evsel__print_ip(struct perf_evsel *evsel, union perf_event *event, 
		}



	} else {

		if (print_ip)

			printf("%16" PRIx64, sample->ip);



		if (print_sym) {

			printf(" ");

			if (print_symoffset)

tools/perf/util/session.h

+6 −1
Original line number Diff line number Diff line
@@ -41,6 +41,11 @@ struct perf_session { 
	char			filename[1];

};



#define PRINT_IP_OPT_IP		(1<<0)

#define PRINT_IP_OPT_SYM		(1<<1)

#define PRINT_IP_OPT_DSO		(1<<2)

#define PRINT_IP_OPT_SYMOFFSET	(1<<3)



struct perf_tool;



struct perf_session *perf_session__new(const char *filename, int mode,
@@ -103,7 +108,7 @@ struct perf_evsel *perf_session__find_first_evtype(struct perf_session *session, 


void perf_evsel__print_ip(struct perf_evsel *evsel, union perf_event *event,

			  struct perf_sample *sample, struct machine *machine,

			  int print_sym, int print_dso, int print_symoffset);

			  unsigned int print_opts);



int perf_session__cpu_bitmap(struct perf_session *session,

			     const char *cpu_list, unsigned long *cpu_bitmap);