We will expand perf diff to support diff cycles of individual programs
blocks, so it requires all data files having branch stacks.

This patch checks HEADER_BRANCH_STACK in header, and only set the flag
has_br_stack when HEADER_BRANCH_STACK are set in all data files.

 v2:
 ---
 Move check_file_brstack() from __cmd_diff() to cmd_diff().
 Because later patch will check flag 'has_br_stack' before
 ui_init().

Signed-off-by: Jin Yao <yao....@linux.intel.com>
---
 tools/perf/builtin-diff.c | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/tools/perf/builtin-diff.c b/tools/perf/builtin-diff.c
index 6e79207..a7e0420 100644
--- a/tools/perf/builtin-diff.c
+++ b/tools/perf/builtin-diff.c
@@ -32,6 +32,7 @@ struct perf_diff {
        struct perf_time_interval       *ptime_range;
        int                              range_size;
        int                              range_num;
+       bool                             has_br_stack;
 };
 
 /* Diff command specific HPP columns. */
@@ -873,6 +874,31 @@ static int parse_time_str(struct data__file *d, char 
*abstime_ostr,
        return ret;
 }
 
+static int check_file_brstack(void)
+{
+       struct data__file *d;
+       bool has_br_stack;
+       int i;
+
+       data__for_each_file(i, d) {
+               d->session = perf_session__new(&d->data, false, &pdiff.tool);
+               if (!d->session) {
+                       pr_err("Failed to open %s\n", d->data.path);
+                       return -1;
+               }
+
+               has_br_stack = perf_header__has_feat(&d->session->header,
+                                                    HEADER_BRANCH_STACK);
+               perf_session__delete(d->session);
+               if (!has_br_stack)
+                       return 0;
+       }
+
+       /* Set only all files having branch stacks */
+       pdiff.has_br_stack = true;
+       return 0;
+}
+
 static int __cmd_diff(void)
 {
        struct data__file *d;
@@ -1487,6 +1513,9 @@ int cmd_diff(int argc, const char **argv)
        if (data_init(argc, argv) < 0)
                return -1;
 
+       if (check_file_brstack() < 0)
+               return -1;
+
        if (ui_init() < 0)
                return -1;
 
-- 
2.7.4

Reply via email to