Commit b2be5451 authored Nov 26, 2015 by Yannick Brosseau Committed by Arnaldo Carvalho de Melo Nov 26, 2015

perf tools: Correctly identify anon_hugepage when generating map (v2)



When parsing /proc/xxx/maps, the sscanf in perf_event__synthesize_mmap_events
truncate the map name at the space in "/anon_hugepage (deleted)".

is_anon_memory() then only receives the string "/anon_hugepage" and does
not detect it.  We change is_anon_memory() to only compare the first
part of the string, effectively ignoring if " (deleted)" is there.

Signed-off-by: Yannick Brosseau <scientist@fb.com>
Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Joshua Zhu <zhu.wen-jie@hp.com>
Cc: kernel-team@fb.com
Link: http://lkml.kernel.org/r/1448538152-2898-1-git-send-email-scientist@fb.com


Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

parent c03d5184

tools/perf/util/map.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -26,8 +26,8 @@ const char *map_type__name[MAP__NR_TYPES] = {
	static inline int is_anon_memory(const char *filename)		static inline int is_anon_memory(const char *filename)
	{		{
	return !strcmp(filename, "//anon") \|\|		return !strcmp(filename, "//anon") \|\|
	!strcmp(filename, "/dev/zero (deleted)") \|\|		!strncmp(filename, "/dev/zero", sizeof("/dev/zero") - 1) \|\|
	!strcmp(filename, "/anon_hugepage (deleted)");		!strncmp(filename, "/anon_hugepage", sizeof("/anon_hugepage") - 1);
	}		}

	static inline int is_no_dso_memory(const char *filename)		static inline int is_no_dso_memory(const char *filename)

Admin message