From: David Carrillo-Cisneros <davidcc@google.com>
To: linux-kernel@vger.kernel.org
Cc: Peter Zijlstra <peterz@infradead.org>,
Ingo Molnar <mingo@redhat.com>,
Arnaldo Carvalho de Melo <acme@kernel.org>,
Alexander Shishkin <alexander.shishkin@linux.intel.com>,
Andi Kleen <ak@linux.intel.com>, Simon Que <sque@chromium.org>,
Wang Nan <wangnan0@huawei.com>, Jiri Olsa <jolsa@kernel.org>,
He Kuang <hekuang@huawei.com>,
Masami Hiramatsu <mhiramat@kernel.org>,
Stephane Eranian <eranian@google.com>,
Paul Turner <pjt@google.com>,
David Carrillo-Cisneros <davidcc@google.com>
Subject: [PATCH v4 14/16] perf tool: add show_feature_header to perf_tool
Date: Mon, 12 Jun 2017 21:29:30 -0700 [thread overview]
Message-ID: <20170613042932.141842-15-davidcc@google.com> (raw)
In-Reply-To: <20170613042932.141842-1-davidcc@google.com>
Add show_feat_hdr to control level of printed information
of feature headers.
Signed-off-by: David Carrillo-Cisneros <davidcc@google.com>
---
tools/perf/builtin-report.c | 11 ++++++++---
tools/perf/builtin-script.c | 3 +++
tools/perf/util/tool.h | 7 +++++++
3 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c
index 22478ff2b706..7620d708c78b 100644
--- a/tools/perf/builtin-report.c
+++ b/tools/perf/builtin-report.c
@@ -985,9 +985,14 @@ int cmd_report(int argc, const char **argv)
perf_hpp_list.need_collapse = true;
}
- /* Force tty output for header output and per-thread stat. */
- if (report.header || report.header_only || report.show_threads)
- use_browser = 0;
+ if (report.header || report.header_only) {
+ report.tool.show_feat_hdr = SHOW_FEAT_HEADER;
+ /* Force tty output for header output and per-thread stat. */
+ if (report.show_threads)
+ use_browser = 0;
+ }
+ if (report.show_full_info)
+ report.tool.show_feat_hdr = SHOW_FEAT_HEADER_FULL_INFO;
if (strcmp(input_name, "-") != 0)
setup_browser(true);
diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c
index afa84debc5c4..46f929391391 100644
--- a/tools/perf/builtin-script.c
+++ b/tools/perf/builtin-script.c
@@ -2717,10 +2717,13 @@ int cmd_script(int argc, const char **argv)
return -1;
if (header || header_only) {
+ script.tool.show_feat_hdr = SHOW_FEAT_HEADER;
perf_session__fprintf_info(session, stdout, show_full_info);
if (header_only)
goto out_delete;
}
+ if (show_full_info)
+ script.tool.show_feat_hdr = SHOW_FEAT_HEADER_FULL_INFO;
if (symbol__init(&session->header.env) < 0)
goto out_delete;
diff --git a/tools/perf/util/tool.h b/tools/perf/util/tool.h
index 829471a1c6d7..baeca808dfda 100644
--- a/tools/perf/util/tool.h
+++ b/tools/perf/util/tool.h
@@ -34,6 +34,12 @@ typedef int (*event_oe)(struct perf_tool *tool, union perf_event *event,
typedef s64 (*event_op3)(struct perf_tool *tool, union perf_event *event,
struct perf_session *session);
+enum show_feature_header {
+ SHOW_FEAT_NO_HEADER = 0,
+ SHOW_FEAT_HEADER,
+ SHOW_FEAT_HEADER_FULL_INFO,
+};
+
struct perf_tool {
event_sample sample,
read;
@@ -68,6 +74,7 @@ struct perf_tool {
bool ordered_events;
bool ordering_requires_timestamps;
bool namespace_events;
+ enum show_feature_header show_feat_hdr;
};
#endif /* __PERF_TOOL_H */
--
2.13.1.508.gb3defc5cc-goog
next prev parent reply other threads:[~2017-06-13 4:30 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-06-13 4:29 [PATCH v4 00/16] perf tool: add meta-data header support for pipe-mode David Carrillo-Cisneros
2017-06-13 4:29 ` [PATCH v4 01/16] perf header: encapsulate read and swap David Carrillo-Cisneros
2017-06-13 4:29 ` [PATCH v4 02/16] perf header: add PROCESS_STR_FUN macro David Carrillo-Cisneros
2017-06-13 4:29 ` [PATCH v4 03/16] perf header: fail on write_padded error David Carrillo-Cisneros
2017-06-13 4:29 ` [PATCH v4 04/16] perf util: add const modifier to buf in "writen" function David Carrillo-Cisneros
2017-06-13 4:29 ` [PATCH v4 05/16] perf header: revamp do_write David Carrillo-Cisneros
2017-06-13 4:29 ` [PATCH v4 06/16] perf header: add struct feat_fd for write David Carrillo-Cisneros
2017-06-13 4:29 ` [PATCH v4 07/16] perf header: use struct feat_fd for print David Carrillo-Cisneros
2017-06-13 4:29 ` [PATCH v4 08/16] perf header: use struct feat_fd to process header records David Carrillo-Cisneros
2017-06-13 4:29 ` [PATCH v4 09/16] perf header: don't pass struct perf_file_section to process_##_feat David Carrillo-Cisneros
2017-06-13 18:54 ` Jiri Olsa
2017-06-14 1:51 ` David Carrillo-Cisneros
2017-06-13 4:29 ` [PATCH v4 10/16] perf header: use struct feat_fd in read header records David Carrillo-Cisneros
2017-06-13 4:29 ` [PATCH v4 11/16] perf header: make write_pmu_mappings pipe-mode friendly David Carrillo-Cisneros
2017-06-13 4:29 ` [PATCH v4 12/16] perf header: add a buffer to struct feat_fd David Carrillo-Cisneros
2017-06-13 18:54 ` Jiri Olsa
2017-06-14 1:54 ` David Carrillo-Cisneros
2017-06-13 4:29 ` [PATCH v4 13/16] perf header: change FEAT_OP* macros David Carrillo-Cisneros
2017-06-13 4:29 ` David Carrillo-Cisneros [this message]
2017-06-13 18:55 ` [PATCH v4 14/16] perf tool: add show_feature_header to perf_tool Jiri Olsa
2017-06-13 4:29 ` [PATCH v4 15/16] perf tools: add feature header record to pipe-mode David Carrillo-Cisneros
2017-06-13 18:54 ` Jiri Olsa
2017-06-13 18:54 ` Jiri Olsa
2017-07-12 0:32 ` David Carrillo-Cisneros
2017-07-12 7:38 ` Jiri Olsa
2017-07-18 4:37 ` David Carrillo-Cisneros
2017-06-13 4:29 ` [PATCH v4 16/16] perf header: add event desc to pipe-mode header David Carrillo-Cisneros
2017-06-13 18:54 ` [PATCH v4 00/16] perf tool: add meta-data header support for pipe-mode Jiri Olsa
2017-06-14 6:44 ` David Carrillo-Cisneros
2017-06-13 18:55 ` Jiri Olsa
2017-06-14 6:51 ` David Carrillo-Cisneros
2017-06-14 7:20 ` Jiri Olsa
2017-06-14 18:36 ` David Carrillo-Cisneros
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=20170613042932.141842-15-davidcc@google.com \
--to=davidcc@google.com \
--cc=acme@kernel.org \
--cc=ak@linux.intel.com \
--cc=alexander.shishkin@linux.intel.com \
--cc=eranian@google.com \
--cc=hekuang@huawei.com \
--cc=jolsa@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mhiramat@kernel.org \
--cc=mingo@redhat.com \
--cc=peterz@infradead.org \
--cc=pjt@google.com \
--cc=sque@chromium.org \
--cc=wangnan0@huawei.com \
/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