perf sort: Make column width code per hists instance

They were globals, and since we support multiple hists and sessions
at the same time, it doesn't make sense to calculate those values
considereing all symbols in all sessions.

Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
LKML-Reference: <new-submission>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

1 files changed, 21 insertions, 6 deletions

diff --git a/tools/perf/util/hist.h b/tools/perf/util/hist.h
index 83fa33a7b38b..92962b2f579b 100644
--- a/tools/perf/util/hist.h
+++ b/tools/perf/util/hist.h
@@ -56,6 +56,16 @@ struct events_stats {
         u32 nr_unknown_events;
 };
 
+enum hist_column {
+        HISTC_SYMBOL,
+        HISTC_DSO,
+        HISTC_THREAD,
+        HISTC_COMM,
+        HISTC_PARENT,
+        HISTC_CPU,
+        HISTC_NR_COLS, /* Last entry */
+};
+
 struct hists {
         struct rb_node          rb_node;
         struct rb_root          entries;
@@ -64,7 +74,7 @@ struct hists {
         u64                     config;
         u64                     event_stream;
         u32                     type;
-        u32                     max_sym_namelen;
+        u16                     col_len[HISTC_NR_COLS];
 };
 
 struct hist_entry *__hists__add_entry(struct hists *self,
@@ -72,12 +82,13 @@ struct hist_entry *__hists__add_entry(struct hists *self,
                                       struct symbol *parent, u64 period);
 extern int64_t hist_entry__cmp(struct hist_entry *, struct hist_entry *);
 extern int64_t hist_entry__collapse(struct hist_entry *, struct hist_entry *);
-int hist_entry__fprintf(struct hist_entry *self, struct hists *pair_hists,
-                        bool show_displacement, long displacement, FILE *fp,
-                        u64 total);
+int hist_entry__fprintf(struct hist_entry *self, struct hists *hists,
+                        struct hists *pair_hists, bool show_displacement,
+                        long displacement, FILE *fp, u64 total);
 int hist_entry__snprintf(struct hist_entry *self, char *bf, size_t size,
-                         struct hists *pair_hists, bool show_displacement,
-                         long displacement, bool color, u64 total);
+                         struct hists *hists, struct hists *pair_hists,
+                         bool show_displacement, long displacement,
+                         bool color, u64 total);
 void hist_entry__free(struct hist_entry *);
 
 void hists__output_resort(struct hists *self);
@@ -95,6 +106,10 @@ int hist_entry__annotate(struct hist_entry *self, struct list_head *head);
 void hists__filter_by_dso(struct hists *self, const struct dso *dso);
 void hists__filter_by_thread(struct hists *self, const struct thread *thread);
 
+u16 hists__col_len(struct hists *self, enum hist_column col);
+void hists__set_col_len(struct hists *self, enum hist_column col, u16 len);
+bool hists__new_col_len(struct hists *self, enum hist_column col, u16 len);
+
 #ifdef NO_NEWT_SUPPORT
 static inline int hists__browse(struct hists *self __used,
                                 const char *helpline __used,