perf tool: Add show_feature_header to perf_tool

Add show_feat_hdr to control level of printed information of feature
headers.

Signed-off-by: David Carrillo-Cisneros <davidcc@google.com>
Acked-by: David Ahern <dsahern@gmail.com>
Acked-by: Jiri Olsa <jolsa@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: He Kuang <hekuang@huawei.com>
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Turner <pjt@google.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Simon Que <sque@chromium.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/r/20170718042549.145161-15-davidcc@google.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c
index 79a33eb1a10d6b2ec69d1928525b88dd15aff9c9..40c3a92c800686435057988715e86cb4babea619 100644 (file)
--- a/tools/perf/builtin-report.c
+++ b/tools/perf/builtin-report.c
@@ -988,6 +988,10 @@ repeat:
        /* 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;
+       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 83cdc0a61fd6fc38813d8bac07894a4190655438..6e44552a05517a90d1377483fcc4bb3eacf12ac9 100644 (file)
--- a/tools/perf/builtin-script.c
+++ b/tools/perf/builtin-script.c
@@ -2972,10 +2972,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 829471a1c6d76bc637c5fcefbeaec89b8d61d39a..baeca808dfda3a00dbf9adc84f1f8191e7ea10bb 100644 (file)
--- 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 */