Merge tag 'trace-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux...

[karo-tx-linux.git] / tools / perf / util / sort.h

diff --git a/tools/perf/util/sort.h b/tools/perf/util/sort.h
index 45ac84c1e037595a9a0070142ef68a9f067aa422..4e80dbd271e77e245d41f2f36afdffdf8ae7ab4e 100644 (file)
--- a/tools/perf/util/sort.h
+++ b/tools/perf/util/sort.h
@@ -29,6 +29,8 @@ extern const char *sort_order;
 extern const char default_parent_pattern[];
 extern const char *parent_pattern;
 extern const char default_sort_order[];
+extern regex_t ignore_callees_regex;
+extern int have_ignore_callees;
 extern int sort__need_collapse;
 extern int sort__has_parent;
 extern int sort__has_sym;
@@ -87,6 +89,9 @@ struct hist_entry {
 
        struct hist_entry_diff  diff;
 
+       /* We are added by hists__add_dummy_entry. */
+       bool                    dummy;
+
        /* XXX These two should move to some tree widget lib */
        u16                     row_offset;
        u16                     nr_rows;
@@ -138,6 +143,8 @@ enum sort_type {
        SORT_PARENT,
        SORT_CPU,
        SORT_SRCLINE,
+       SORT_LOCAL_WEIGHT,
+       SORT_GLOBAL_WEIGHT,
 
        /* branch stack specific sort keys */
        __SORT_BRANCH_STACK,
@@ -149,9 +156,7 @@ enum sort_type {
 
        /* memory mode specific sort keys */
        __SORT_MEMORY_MODE,
-       SORT_LOCAL_WEIGHT = __SORT_MEMORY_MODE,
-       SORT_GLOBAL_WEIGHT,
-       SORT_MEM_DADDR_SYMBOL,
+       SORT_MEM_DADDR_SYMBOL = __SORT_MEMORY_MODE,
        SORT_MEM_DADDR_DSO,
        SORT_MEM_LOCKED,
        SORT_MEM_TLB,
@@ -183,4 +188,6 @@ int setup_sorting(void);
 extern int sort_dimension__add(const char *);
 void sort__setup_elide(FILE *fp);
 
+int report_parse_ignore_callees_opt(const struct option *opt, const char *arg, int unset);
+
 #endif /* __PERF_SORT_H */