1 files changed, 40 insertions, 14 deletions

diff --git a/tools/perf/util/annotate.h b/tools/perf/util/annotate.h
index a4c0d91907e6..005a5fe8a8c6 100644
--- a/tools/perf/util/annotate.h
+++ b/tools/perf/util/annotate.h
@@ -11,6 +11,7 @@
 #include <linux/list.h>
 #include <linux/rbtree.h>
 #include <pthread.h>
+#include <asm/bug.h>
 
 struct ins_ops;
 
@@ -82,6 +83,7 @@ struct annotation_options {
         int  context;
         const char *objdump_path;
         const char *disassembler_style;
+        unsigned int percent_type;
 };
 
 enum {
@@ -101,8 +103,16 @@ struct sym_hist_entry {
         u64             period;
 };
 
+enum {
+        PERCENT_HITS_LOCAL,
+        PERCENT_HITS_GLOBAL,
+        PERCENT_PERIOD_LOCAL,
+        PERCENT_PERIOD_GLOBAL,
+        PERCENT_MAX,
+};
+
 struct annotation_data {
-        double                   percent;
+        double                   percent[PERCENT_MAX];
         double                   percent_sum;
         struct sym_hist_entry    he;
 };
@@ -122,8 +132,8 @@ struct annotation_line {
         char                    *path;
         u32                      idx;
         int                      idx_asm;
-        int                      samples_nr;
-        struct annotation_data   samples[0];
+        int                      data_nr;
+        struct annotation_data   data[0];
 };
 
 struct disasm_line {
@@ -134,6 +144,27 @@ struct disasm_line {
         struct annotation_line   al;
 };
 
+static inline double annotation_data__percent(struct annotation_data *data,
+                                              unsigned int which)
+{
+        return which < PERCENT_MAX ? data->percent[which] : -1;
+}
+
+static inline const char *percent_type_str(unsigned int type)
+{
+        static const char *str[PERCENT_MAX] = {
+                "local hits",
+                "global hits",
+                "local period",
+                "global period",
+        };
+
+        if (WARN_ON(type >= PERCENT_MAX))
+                return "N/A";
+
+        return str[type];
+}
+
 static inline struct disasm_line *disasm_line(struct annotation_line *al)
 {
         return al ? container_of(al, struct disasm_line, al) : NULL;
@@ -169,22 +200,15 @@ struct annotation_write_ops {
         void (*write_graph)(void *obj, int graph);
 };
 
-double annotation_line__max_percent(struct annotation_line *al, struct annotation *notes);
 void annotation_line__write(struct annotation_line *al, struct annotation *notes,
-                            struct annotation_write_ops *ops);
+                            struct annotation_write_ops *ops,
+                            struct annotation_options *opts);
 
 int __annotation__scnprintf_samples_period(struct annotation *notes,
                                            char *bf, size_t size,
                                            struct perf_evsel *evsel,
                                            bool show_freq);
 
-static inline int annotation__scnprintf_samples_period(struct annotation *notes,
-                                                       char *bf, size_t size,
-                                                       struct perf_evsel *evsel)
-{
-        return __annotation__scnprintf_samples_period(notes, bf, size, evsel, true);
-}
-
 int disasm_line__scnprintf(struct disasm_line *dl, char *bf, size_t size, bool raw);
 size_t disasm__fprintf(struct list_head *head, FILE *fp);
 void symbol__calc_percent(struct symbol *sym, struct perf_evsel *evsel);
@@ -340,12 +364,12 @@ int symbol__strerror_disassemble(struct symbol *sym, struct map *map,
 int symbol__annotate_printf(struct symbol *sym, struct map *map,
                             struct perf_evsel *evsel,
                             struct annotation_options *options);
-int symbol__annotate_fprintf2(struct symbol *sym, FILE *fp);
 void symbol__annotate_zero_histogram(struct symbol *sym, int evidx);
 void symbol__annotate_decay_histogram(struct symbol *sym, int evidx);
 void annotated_source__purge(struct annotated_source *as);
 
-int map_symbol__annotation_dump(struct map_symbol *ms, struct perf_evsel *evsel);
+int map_symbol__annotation_dump(struct map_symbol *ms, struct perf_evsel *evsel,
+                                struct annotation_options *opts);
 
 bool ui__has_annotation(void);
 
@@ -373,4 +397,6 @@ static inline int symbol__tui_annotate(struct symbol *sym __maybe_unused,
 
 void annotation_config__init(void);
 
+int annotate_parse_percent_type(const struct option *opt, const char *_str,
+                                int unset);
 #endif  /* __PERF_ANNOTATE_H */