perf hists: Rename __hists__add_entry to hists__add_entry

[linux-2.6-block.git] / tools / perf / util / hist.c

diff --git a/tools/perf/util/hist.c b/tools/perf/util/hist.c
index cfab531437c743c4c849d40fd45545fcb2fbcddc..d2647b1d82c0d7aab532504ec8f46006877c2319 100644 (file)
--- a/tools/perf/util/hist.c
+++ b/tools/perf/util/hist.c
@@ -117,6 +117,13 @@ void hists__calc_col_len(struct hists *hists, struct hist_entry *h)
                        hists__new_col_len(hists, HISTC_SYMBOL_TO, symlen);
                        hists__set_unres_dso_col_len(hists, HISTC_DSO_TO);
                }
+
+               if (h->branch_info->srcline_from)
+                       hists__new_col_len(hists, HISTC_SRCLINE_FROM,
+                                       strlen(h->branch_info->srcline_from));
+               if (h->branch_info->srcline_to)
+                       hists__new_col_len(hists, HISTC_SRCLINE_TO,
+                                       strlen(h->branch_info->srcline_to));
        }
 
        if (h->mem_info) {
@@ -524,13 +531,13 @@ out:
        return he;
 }
 
-struct hist_entry *__hists__add_entry(struct hists *hists,
-                                     struct addr_location *al,
-                                     struct symbol *sym_parent,
-                                     struct branch_info *bi,
-                                     struct mem_info *mi,
-                                     struct perf_sample *sample,
-                                     bool sample_self)
+struct hist_entry *hists__add_entry(struct hists *hists,
+                                   struct addr_location *al,
+                                   struct symbol *sym_parent,
+                                   struct branch_info *bi,
+                                   struct mem_info *mi,
+                                   struct perf_sample *sample,
+                                   bool sample_self)
 {
        struct hist_entry entry = {
                .thread = al->thread,
@@ -615,8 +622,8 @@ iter_add_single_mem_entry(struct hist_entry_iter *iter, struct addr_location *al
         */
        sample->period = cost;
 
-       he = __hists__add_entry(hists, al, iter->parent, NULL, mi,
-                               sample, true);
+       he = hists__add_entry(hists, al, iter->parent, NULL, mi,
+                             sample, true);
        if (!he)
                return -ENOMEM;
 
@@ -720,8 +727,8 @@ iter_add_next_branch_entry(struct hist_entry_iter *iter, struct addr_location *a
        sample->period = 1;
        sample->weight = bi->flags.cycles ? bi->flags.cycles : 1;
 
-       he = __hists__add_entry(hists, al, iter->parent, &bi[i], NULL,
-                               sample, true);
+       he = hists__add_entry(hists, al, iter->parent, &bi[i], NULL,
+                             sample, true);
        if (he == NULL)
                return -ENOMEM;
 
@@ -757,8 +764,8 @@ iter_add_single_normal_entry(struct hist_entry_iter *iter, struct addr_location
        struct perf_sample *sample = iter->sample;
        struct hist_entry *he;
 
-       he = __hists__add_entry(evsel__hists(evsel), al, iter->parent, NULL, NULL,
-                               sample, true);
+       he = hists__add_entry(evsel__hists(evsel), al, iter->parent, NULL, NULL,
+                             sample, true);
        if (he == NULL)
                return -ENOMEM;
 
@@ -818,8 +825,8 @@ iter_add_single_cumulative_entry(struct hist_entry_iter *iter,
        struct hist_entry *he;
        int err = 0;
 
-       he = __hists__add_entry(hists, al, iter->parent, NULL, NULL,
-                               sample, true);
+       he = hists__add_entry(hists, al, iter->parent, NULL, NULL,
+                             sample, true);
        if (he == NULL)
                return -ENOMEM;
 
@@ -893,8 +900,8 @@ iter_add_next_cumulative_entry(struct hist_entry_iter *iter,
                }
        }
 
-       he = __hists__add_entry(evsel__hists(evsel), al, iter->parent, NULL, NULL,
-                               sample, false);
+       he = hists__add_entry(evsel__hists(evsel), al, iter->parent, NULL, NULL,
+                             sample, false);
        if (he == NULL)
                return -ENOMEM;
 
@@ -1042,6 +1049,8 @@ void hist_entry__delete(struct hist_entry *he)
        if (he->branch_info) {
                map__zput(he->branch_info->from.map);
                map__zput(he->branch_info->to.map);
+               free_srcline(he->branch_info->srcline_from);
+               free_srcline(he->branch_info->srcline_to);
                zfree(&he->branch_info);
        }
 
@@ -1072,7 +1081,7 @@ int hist_entry__snprintf_alignment(struct hist_entry *he, struct perf_hpp *hpp,
                                   struct perf_hpp_fmt *fmt, int printed)
 {
        if (!list_is_last(&fmt->list, &he->hists->hpp_list->fields)) {
-               const int width = fmt->width(fmt, hpp, hists_to_evsel(he->hists));
+               const int width = fmt->width(fmt, hpp, he->hists);
                if (printed < width) {
                        advance_hpp(hpp, printed);
                        printed = scnprintf(hpp->buf, hpp->size, "%-*s", width - printed, " ");