perf tools: Move srcline definitions to separate header

[karo-tx-linux.git] / tools / perf / ui / stdio / hist.c

diff --git a/tools/perf/ui/stdio/hist.c b/tools/perf/ui/stdio/hist.c
index 668f4aecf2e6dfd933deb963d50362d09caa9fd9..66aa4eb369f17761e2c565b6fc056e0ec06a7518 100644 (file)
--- a/tools/perf/ui/stdio/hist.c
+++ b/tools/perf/ui/stdio/hist.c
@@ -4,7 +4,8 @@
 #include "../../util/hist.h"
 #include "../../util/sort.h"
 #include "../../util/evsel.h"
-
+#include "../../util/srcline.h"
+#include "../../util/sane_ctype.h"
 
 static size_t callchain__fprintf_left_margin(FILE *fp, int left_margin)
 {
@@ -17,6 +18,67 @@ static size_t callchain__fprintf_left_margin(FILE *fp, int left_margin)
        return ret;
 }
 
+static size_t inline__fprintf(struct map *map, u64 ip, int left_margin,
+                             int depth, int depth_mask, FILE *fp)
+{
+       struct dso *dso;
+       struct inline_node *node;
+       struct inline_list *ilist;
+       int ret = 0, i;
+
+       if (map == NULL)
+               return 0;
+
+       dso = map->dso;
+       if (dso == NULL)
+               return 0;
+
+       if (dso->kernel != DSO_TYPE_USER)
+               return 0;
+
+       node = dso__parse_addr_inlines(dso,
+                                      map__rip_2objdump(map, ip));
+       if (node == NULL)
+               return 0;
+
+       list_for_each_entry(ilist, &node->val, list) {
+               if ((ilist->filename != NULL) || (ilist->funcname != NULL)) {
+                       ret += callchain__fprintf_left_margin(fp, left_margin);
+
+                       for (i = 0; i < depth; i++) {
+                               if (depth_mask & (1 << i))
+                                       ret += fprintf(fp, "|");
+                               else
+                                       ret += fprintf(fp, " ");
+                               ret += fprintf(fp, "          ");
+                       }
+
+                       if (callchain_param.key == CCKEY_ADDRESS ||
+                           callchain_param.key == CCKEY_SRCLINE) {
+                               if (ilist->filename != NULL)
+                                       ret += fprintf(fp, "%s:%d (inline)",
+                                                      ilist->filename,
+                                                      ilist->line_nr);
+                               else
+                                       ret += fprintf(fp, "??");
+                       } else if (ilist->funcname != NULL)
+                               ret += fprintf(fp, "%s (inline)",
+                                              ilist->funcname);
+                       else if (ilist->filename != NULL)
+                               ret += fprintf(fp, "%s:%d (inline)",
+                                              ilist->filename,
+                                              ilist->line_nr);
+                       else
+                               ret += fprintf(fp, "??");
+
+                       ret += fprintf(fp, "\n");
+               }
+       }
+
+       inline_node__delete(node);
+       return ret;
+}
+
 static size_t ipchain__fprintf_graph_line(FILE *fp, int depth, int depth_mask,
                                          int left_margin)
 {
@@ -78,6 +140,10 @@ static size_t ipchain__fprintf_graph(FILE *fp, struct callchain_node *node,
        fputs(str, fp);
        fputc('\n', fp);
        free(alloc_str);
+
+       if (symbol_conf.inline_name)
+               ret += inline__fprintf(chain->ms.map, chain->ip,
+                                      left_margin, depth, depth_mask, fp);
        return ret;
 }
 
@@ -229,6 +295,7 @@ static size_t callchain__fprintf_graph(FILE *fp, struct rb_root *root,
                        if (!i++ && field_order == NULL &&
                            sort_order && !prefixcmp(sort_order, "sym"))
                                continue;
+
                        if (!printed) {
                                ret += callchain__fprintf_left_margin(fp, left_margin);
                                ret += fprintf(fp, "|\n");
@@ -251,6 +318,13 @@ static size_t callchain__fprintf_graph(FILE *fp, struct rb_root *root,
 
                        if (++entries_printed == callchain_param.print_limit)
                                break;
+
+                       if (symbol_conf.inline_name)
+                               ret += inline__fprintf(chain->ms.map,
+                                                      chain->ip,
+                                                      left_margin,
+                                                      0, 0,
+                                                      fp);
                }
                root = &cnode->rb_root;
        }
@@ -529,6 +603,8 @@ static int hist_entry__fprintf(struct hist_entry *he, size_t size,
                               bool use_callchain)
 {
        int ret;
+       int callchain_ret = 0;
+       int inline_ret = 0;
        struct perf_hpp hpp = {
                .buf            = bf,
                .size           = size,
@@ -547,7 +623,16 @@ static int hist_entry__fprintf(struct hist_entry *he, size_t size,
        ret = fprintf(fp, "%s\n", bf);
 
        if (use_callchain)
-               ret += hist_entry_callchain__fprintf(he, total_period, 0, fp);
+               callchain_ret = hist_entry_callchain__fprintf(he, total_period,
+                                                             0, fp);
+
+       if (callchain_ret == 0 && symbol_conf.inline_name) {
+               inline_ret = inline__fprintf(he->ms.map, he->ip, 0, 0, 0, fp);
+               ret += inline_ret;
+               if (inline_ret > 0)
+                       ret += fprintf(fp, "\n");
+       } else
+               ret += callchain_ret;
 
        return ret;
 }