From: Arnaldo Carvalho de Melo <acme@kernel.org>
To: Ingo Molnar <mingo@kernel.org>
Cc: linux-kernel@vger.kernel.org, Jiri Olsa <jolsa@kernel.org>,
Andi Kleen <ak@linux.intel.com>, David Ahern <dsahern@gmail.com>,
Namhyung Kim <namhyung@kernel.org>,
Peter Zijlstra <a.p.zijlstra@chello.nl>,
Stephane Eranian <eranian@google.com>,
Arnaldo Carvalho de Melo <acme@redhat.com>
Subject: [PATCH 11/31] perf script: Display data_src values
Date: Wed, 24 Feb 2016 22:58:06 -0300 [thread overview]
Message-ID: <1456365506-5492-12-git-send-email-acme@kernel.org> (raw)
In-Reply-To: <1456365506-5492-1-git-send-email-acme@kernel.org>
From: Jiri Olsa <jolsa@kernel.org>
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: Jiri Olsa <jolsa@kernel.org>
Tested-by: Arnaldo 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: Arnaldo Carvalho de Melo <acme@redhat.com>
---
tools/perf/builtin-script.c | 20 +++++++++++++++++++-
tools/perf/util/mem-events.c | 15 +++++++++++++++
tools/perf/util/mem-events.h | 2 ++
3 files changed, 36 insertions(+), 1 deletion(-)
diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c
index f4caf4898245..8ff5ff0fe38c 100644
--- a/tools/perf/builtin-script.c
+++ b/tools/perf/builtin-script.c
@@ -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);
diff --git a/tools/perf/util/mem-events.c b/tools/perf/util/mem-events.c
index eadb83d16367..75465f89a413 100644
--- a/tools/perf/util/mem-events.c
+++ b/tools/perf/util/mem-events.c
@@ -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;
+}
diff --git a/tools/perf/util/mem-events.h b/tools/perf/util/mem-events.h
index 87c44ff75dc8..5d6d93066a6e 100644
--- a/tools/perf/util/mem-events.h
+++ b/tools/perf/util/mem-events.h
@@ -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 */
--
2.5.0
next prev parent reply other threads:[~2016-02-25 1:58 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-25 1:57 [GIT PULL 00/31] perf/core improvements and fixes Arnaldo Carvalho de Melo
2016-02-25 1:57 ` [PATCH 01/31] perf mem record: Check for memory events support Arnaldo Carvalho de Melo
2016-02-25 1:57 ` [PATCH 02/31] perf mem: Introduce perf_mem_events__name function Arnaldo Carvalho de Melo
2016-02-25 1:57 ` [PATCH 03/31] perf tools: Introduce perf_mem__tlb_scnprintf function Arnaldo Carvalho de Melo
2016-02-25 1:57 ` [PATCH 04/31] perf tools: Introduce perf_mem__lvl_scnprintf function Arnaldo Carvalho de Melo
2016-02-25 1:58 ` [PATCH 05/31] perf tools: Introduce perf_mem__snp_scnprintf function Arnaldo Carvalho de Melo
2016-02-25 1:58 ` [PATCH 06/31] perf tools: Introduce perf_mem__lck_scnprintf function Arnaldo Carvalho de Melo
2016-02-25 1:58 ` [PATCH 07/31] perf tools: Change perf_mem__tlb_scnprintf to return nb of displayed bytes Arnaldo Carvalho de Melo
2016-02-25 1:58 ` [PATCH 08/31] perf tools: Change perf_mem__lvl_scnprintf " Arnaldo Carvalho de Melo
2016-02-25 1:58 ` [PATCH 09/31] perf tools: Change perf_mem__snp_scnprintf " Arnaldo Carvalho de Melo
2016-02-25 1:58 ` [PATCH 10/31] perf tools: Change perf_mem__lck_scnprintf " Arnaldo Carvalho de Melo
2016-02-25 1:58 ` Arnaldo Carvalho de Melo [this message]
2016-02-25 1:58 ` [PATCH 12/31] perf tools: Make binary data printer code in trace_event public available Arnaldo Carvalho de Melo
2016-02-25 1:58 ` [PATCH 13/31] perf script: Print bpf-output events in 'perf script' Arnaldo Carvalho de Melo
2016-02-25 1:58 ` [PATCH 14/31] perf tools: Add helper functions for some sort keys Arnaldo Carvalho de Melo
2016-02-25 1:58 ` [PATCH 15/31] perf hists: Basic support of hierarchical report view Arnaldo Carvalho de Melo
2016-02-25 1:58 ` [PATCH 16/31] perf hists: Resort hist entries with hierarchy Arnaldo Carvalho de Melo
2016-02-25 1:58 ` [PATCH 17/31] perf hists: Add helper functions for hierarchy mode Arnaldo Carvalho de Melo
2016-02-25 1:58 ` [PATCH 18/31] perf hists: Introduce hist_entry__filter() Arnaldo Carvalho de Melo
2016-02-25 1:58 ` [PATCH 19/31] perf hists: Support filtering in hierarchy mode Arnaldo Carvalho de Melo
2016-02-25 1:58 ` [PATCH 20/31] perf hists: Resort after filtering hierarchy Arnaldo Carvalho de Melo
2016-02-25 1:58 ` [PATCH 21/31] perf hists: Count number of sort keys Arnaldo Carvalho de Melo
2016-02-25 1:58 ` [PATCH 22/31] perf ui/stdio: Implement hierarchy output mode Arnaldo Carvalho de Melo
2016-02-25 1:58 ` [PATCH 23/31] perf ui/stdio: Align column header for hierarchy output Arnaldo Carvalho de Melo
2016-02-25 1:58 ` [PATCH 24/31] perf hists browser: Count number of hierarchy entries Arnaldo Carvalho de Melo
2016-02-25 1:58 ` [PATCH 25/31] perf hists browser: Support collapsing/expanding whole entries in hierarchy Arnaldo Carvalho de Melo
2016-02-25 1:58 ` [PATCH 26/31] perf hists browser: Implement hierarchy output Arnaldo Carvalho de Melo
2016-02-25 1:58 ` [PATCH 27/31] perf hists browser: Align column header in hierarchy mode Arnaldo Carvalho de Melo
2016-02-25 1:58 ` [PATCH 28/31] perf ui/gtk: Implement hierarchy output mode Arnaldo Carvalho de Melo
2016-02-25 1:58 ` [PATCH 29/31] perf report: Add --hierarchy option Arnaldo Carvalho de Melo
2016-02-25 1:58 ` [PATCH 30/31] perf hists: Support decaying in hierarchy mode Arnaldo Carvalho de Melo
2016-02-25 1:58 ` [PATCH 31/31] perf top: Add --hierarchy option Arnaldo Carvalho de Melo
2016-02-25 7:22 ` [GIT PULL 00/31] perf/core improvements and fixes Ingo Molnar
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1456365506-5492-12-git-send-email-acme@kernel.org \
--to=acme@kernel.org \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@redhat.com \
--cc=ak@linux.intel.com \
--cc=dsahern@gmail.com \
--cc=eranian@google.com \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=namhyung@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).