Commit c19ac912 authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo
Browse files

perf script: Display data_src values 



Adding support to display data_src values, for events with data_src data
in sample.

Example:
  $ perf script
  ...
           rcuos/3    32 [002] ... 68501042 Local RAM hit|SNP None or Hit|TLB L1 or L2 hit|LCK No   ...
           rcuos/3    32 [002] ... 68100142 L1 hit|SNP None|TLB L1 or L2 hit|LCK No                 ...
           swapper     0 [002] ... 68100242 LFB hit|SNP None|TLB L1 or L2 hit|LCK No                ...
           swapper     0 [000] ... 68100142 L1 hit|SNP None|TLB L1 or L2 hit|LCK No                 ...
           swapper     0 [000] ... 50100142 L1 hit|SNP None|TLB L2 miss|LCK No                      ...
           rcuos/3    32 [002] ... 68100142 L1 hit|SNP None|TLB L1 or L2 hit|LCK No                 ...
   plugin-containe 16538 [000] ... 6a100142 L1 hit|SNP None|TLB L1 or L2 hit|LCK Yes                ...
           gkrellm  1736 [000] ... 68100242 LFB hit|SNP None|TLB L1 or L2 hit|LCK No                ...
           gkrellm  1736 [000] ... 6a100142 L1 hit|SNP None|TLB L1 or L2 hit|LCK Yes                ...

                                   ^^^^^^^^ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
                             data_src value                     data_src translation

Signed-off-by: default avatarJiri Olsa <jolsa@kernel.org>
Tested-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/1456303616-26926-14-git-send-email-jolsa@kernel.org


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

tools/perf/builtin-script.c

+19 −1
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include "util/stat.h"

#include <linux/bitmap.h>

#include "asm/bug.h"

#include "util/mem-events.h"



static char const		*script_name;

static char const		*generate_script_lang;
@@ -649,6 +650,23 @@ static int perf_evlist__max_name_len(struct perf_evlist *evlist) 
	return max;

}



static size_t data_src__printf(u64 data_src)

{

	struct mem_info mi = { .data_src.val = data_src };

	char decode[100];

	char out[100];

	static int maxlen;

	int len;



	perf_script__meminfo_scnprintf(decode, 100, &mi);



	len = scnprintf(out, 100, "%16" PRIx64 " %s", data_src, decode);

	if (maxlen < len)

		maxlen = len;



	return printf("%-*s", maxlen, out);

}



static void process_event(struct perf_script *script, union perf_event *event,

			  struct perf_sample *sample, struct perf_evsel *evsel,

			  struct addr_location *al)
@@ -689,7 +707,7 @@ static void process_event(struct perf_script *script, union perf_event *event, 
		print_sample_addr(event, sample, thread, attr);



	if (PRINT_FIELD(DATA_SRC))

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

		data_src__printf(sample->data_src);



	if (PRINT_FIELD(WEIGHT))

		printf("%16" PRIu64, sample->weight);

tools/perf/util/mem-events.c

+15 −0
Original line number Diff line number Diff line
@@ -238,3 +238,18 @@ int perf_mem__lck_scnprintf(char *out, size_t sz, struct mem_info *mem_info) 


	return l;

}



int perf_script__meminfo_scnprintf(char *out, size_t sz, struct mem_info *mem_info)

{

	int i = 0;



	i += perf_mem__lvl_scnprintf(out, sz, mem_info);

	i += scnprintf(out + i, sz - i, "|SNP ");

	i += perf_mem__snp_scnprintf(out + i, sz - i, mem_info);

	i += scnprintf(out + i, sz - i, "|TLB ");

	i += perf_mem__tlb_scnprintf(out + i, sz - i, mem_info);

	i += scnprintf(out + i, sz - i, "|LCK ");

	i += perf_mem__lck_scnprintf(out + i, sz - i, mem_info);



	return i;

}

tools/perf/util/mem-events.h

+2 −0
Original line number Diff line number Diff line
@@ -30,4 +30,6 @@ int perf_mem__lvl_scnprintf(char *out, size_t sz, struct mem_info *mem_info); 
int perf_mem__snp_scnprintf(char *out, size_t sz, struct mem_info *mem_info);

int perf_mem__lck_scnprintf(char *out, size_t sz, struct mem_info *mem_info);



int perf_script__meminfo_scnprintf(char *bf, size_t size, struct mem_info *mem_info);



#endif /* __PERF_MEM_EVENTS_H */

CRA Git | Maintained and supported by SUSTech CRA and CCSE