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

Commit c7405d85 authored by Namhyung Kim's avatar Namhyung Kim Committed by Jiri Olsa
Browse files

perf tools: Update cpumode for each cumulative entry 



The cpumode and level in struct addr_localtion was set for a sample
and but updated as cumulative callchains were added.  This led to have
non-matching symbol and cpumode in the output.

Update it accordingly based on the fact whether the map is a part of
the kernel or not.  This is a reverse of what thread__find_addr_map()
does.

Signed-off-by: default avatarNamhyung Kim <namhyung@kernel.org>
Tested-by: default avatarArun Sharma <asharma@fb.com>
Tested-by: default avatarRodrigo Campos <rodrigo@sdfg.com.ar>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Link: http://lkml.kernel.org/r/1401335910-16832-7-git-send-email-namhyung@kernel.org


Signed-off-by: default avatarJiri Olsa <jolsa@kernel.org>
parent 7a13aa28

tools/perf/util/callchain.c

+42 −0
Original line number Diff line number Diff line
@@ -630,3 +630,45 @@ int hist_entry__append_callchain(struct hist_entry *he, struct perf_sample *samp 
		return 0;

	return callchain_append(he->callchain, &callchain_cursor, sample->period);

}



int fill_callchain_info(struct addr_location *al, struct callchain_cursor_node *node,

			bool hide_unresolved)

{

	al->map = node->map;

	al->sym = node->sym;

	if (node->map)

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

	else

		al->addr = node->ip;



	if (al->sym == NULL) {

		if (hide_unresolved)

			return 0;

		if (al->map == NULL)

			goto out;

	}



	if (al->map->groups == &al->machine->kmaps) {

		if (machine__is_host(al->machine)) {

			al->cpumode = PERF_RECORD_MISC_KERNEL;

			al->level = 'k';

		} else {

			al->cpumode = PERF_RECORD_MISC_GUEST_KERNEL;

			al->level = 'g';

		}

	} else {

		if (machine__is_host(al->machine)) {

			al->cpumode = PERF_RECORD_MISC_USER;

			al->level = '.';

		} else if (perf_guest) {

			al->cpumode = PERF_RECORD_MISC_GUEST_USER;

			al->level = 'u';

		} else {

			al->cpumode = PERF_RECORD_MISC_HYPERVISOR;

			al->level = 'H';

		}

	}



out:

	return 1;

}

tools/perf/util/callchain.h

+2 −0
Original line number Diff line number Diff line
@@ -162,6 +162,8 @@ int sample__resolve_callchain(struct perf_sample *sample, struct symbol **parent 
			      struct perf_evsel *evsel, struct addr_location *al,

			      int max_stack);

int hist_entry__append_callchain(struct hist_entry *he, struct perf_sample *sample);

int fill_callchain_info(struct addr_location *al, struct callchain_cursor_node *node,

			bool hide_unresolved);



extern const char record_callchain_help[];

int parse_callchain_report_opt(const char *arg);

tools/perf/util/hist.c

+2 −11
Original line number Diff line number Diff line
@@ -743,18 +743,9 @@ iter_next_cumulative_entry(struct hist_entry_iter *iter, 
	if (node == NULL)

		return 0;



	al->map = node->map;

	al->sym = node->sym;

	if (node->map)

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

	else

		al->addr = node->ip;



	if (iter->hide_unresolved && al->sym == NULL)

		return 0;



	callchain_cursor_advance(&callchain_cursor);

	return 1;



	return fill_callchain_info(al, node, iter->hide_unresolved);

}



static int