perf tools: Get rid of obsolete hist_entry__sort_list

Now we moved to the perf_hpp_[_sort]_list so no need to keep the old
hist_entry__sort_list and sort__first_dimension.  Also the
hist_entry__sort_snprintf() can be gone as hist_entry__snprintf()
provides the functionality.

Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Link: http://lkml.kernel.org/r/1400480762-22852-18-git-send-email-namhyung@kernel.org
Signed-off-by: Jiri Olsa <jolsa@kernel.org>

2 files changed, 24 insertions, 34 deletions

diff --git a/tools/perf/ui/hist.c b/tools/perf/ui/hist.c
index b114c6668865..61cf31e094f3 100644
--- a/tools/perf/ui/hist.c
+++ b/tools/perf/ui/hist.c
@@ -459,47 +459,29 @@ next:
         }
 }
 
-int hist_entry__sort_snprintf(struct hist_entry *he, char *s, size_t size,
-                              struct hists *hists)
-{
-        const char *sep = symbol_conf.field_sep;
-        struct sort_entry *se;
-        int ret = 0;
-
-        list_for_each_entry(se, &hist_entry__sort_list, list) {
-                if (se->elide)
-                        continue;
-
-                ret += scnprintf(s + ret, size - ret, "%s", sep ?: "  ");
-                ret += se->se_snprintf(he, s + ret, size - ret,
-                                       hists__col_len(hists, se->se_width_idx));
-        }
-
-        return ret;
-}
-
 /*
  * See hists__fprintf to match the column widths
  */
 unsigned int hists__sort_list_width(struct hists *hists)
 {
         struct perf_hpp_fmt *fmt;
-        struct sort_entry *se;
-        int i = 0, ret = 0;
+        int ret = 0;
+        bool first = true;
         struct perf_hpp dummy_hpp;
 
         perf_hpp__for_each_format(fmt) {
-                if (i)
+                if (perf_hpp__should_skip(fmt))
+                        continue;
+
+                if (first)
+                        first = false;
+                else
                         ret += 2;
 
                 ret += fmt->width(fmt, &dummy_hpp, hists_to_evsel(hists));
         }
 
-        list_for_each_entry(se, &hist_entry__sort_list, list)
-                if (!se->elide)
-                        ret += 2 + hists__col_len(hists, se->se_width_idx);
-
-        if (verbose) /* Addr + origin */
+        if (verbose && sort__has_sym) /* Addr + origin */
                 ret += 3 + BITS_PER_LONG / 4;
 
         return ret;
diff --git a/tools/perf/ui/stdio/hist.c b/tools/perf/ui/stdio/hist.c
index cfcd3f6fd1c5..9f57991025a9 100644
--- a/tools/perf/ui/stdio/hist.c
+++ b/tools/perf/ui/stdio/hist.c
@@ -183,7 +183,8 @@ static size_t callchain__fprintf_graph(FILE *fp, struct rb_root *root,
                          * the symbol. No need to print it otherwise it appears as
                          * displayed twice.
                          */
-                        if (!i++ && sort__first_dimension == SORT_SYM)
+                        if (!i++ && field_order == NULL &&
+                            sort_order && !prefixcmp(sort_order, "sym"))
                                 continue;
                         if (!printed) {
                                 ret += callchain__fprintf_left_margin(fp, left_margin);
@@ -296,13 +297,20 @@ static size_t hist_entry__callchain_fprintf(struct hist_entry *he,
         int left_margin = 0;
         u64 total_period = hists->stats.total_period;
 
-        if (sort__first_dimension == SORT_COMM) {
-                struct sort_entry *se = list_first_entry(&hist_entry__sort_list,
-                                                         typeof(*se), list);
-                left_margin = hists__col_len(hists, se->se_width_idx);
-                left_margin -= thread__comm_len(he->thread);
-        }
+        if (field_order == NULL && (sort_order == NULL ||
+                                    !prefixcmp(sort_order, "comm"))) {
+                struct perf_hpp_fmt *fmt;
+
+                perf_hpp__for_each_format(fmt) {
+                        if (!perf_hpp__is_sort_entry(fmt))
+                                continue;
 
+                        /* must be 'comm' sort entry */
+                        left_margin = fmt->width(fmt, NULL, hists_to_evsel(hists));
+                        left_margin -= thread__comm_len(he->thread);
+                        break;
+                }
+        }
         return hist_entry_callchain__fprintf(he, total_period, left_margin, fp);
 }