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>
This commit is contained in:
@@ -1,4 +1,5 @@
|
||||
#include "sort.h"
|
||||
#include "hist.h"
|
||||
|
||||
regex_t parent_regex;
|
||||
const char default_parent_pattern[] = "^sys_|^do_page_fault";
|
||||
@@ -10,11 +11,6 @@ int sort__has_parent = 0;
|
||||
|
||||
enum sort_type sort__first_dimension;
|
||||
|
||||
unsigned int dsos__col_width;
|
||||
unsigned int comms__col_width;
|
||||
unsigned int threads__col_width;
|
||||
unsigned int cpus__col_width;
|
||||
static unsigned int parent_symbol__col_width;
|
||||
char * field_sep;
|
||||
|
||||
LIST_HEAD(hist_entry__sort_list);
|
||||
@@ -36,7 +32,7 @@ struct sort_entry sort_thread = {
|
||||
.se_header = "Command: Pid",
|
||||
.se_cmp = sort__thread_cmp,
|
||||
.se_snprintf = hist_entry__thread_snprintf,
|
||||
.se_width = &threads__col_width,
|
||||
.se_width_idx = HISTC_THREAD,
|
||||
};
|
||||
|
||||
struct sort_entry sort_comm = {
|
||||
@@ -44,34 +40,35 @@ struct sort_entry sort_comm = {
|
||||
.se_cmp = sort__comm_cmp,
|
||||
.se_collapse = sort__comm_collapse,
|
||||
.se_snprintf = hist_entry__comm_snprintf,
|
||||
.se_width = &comms__col_width,
|
||||
.se_width_idx = HISTC_COMM,
|
||||
};
|
||||
|
||||
struct sort_entry sort_dso = {
|
||||
.se_header = "Shared Object",
|
||||
.se_cmp = sort__dso_cmp,
|
||||
.se_snprintf = hist_entry__dso_snprintf,
|
||||
.se_width = &dsos__col_width,
|
||||
.se_width_idx = HISTC_DSO,
|
||||
};
|
||||
|
||||
struct sort_entry sort_sym = {
|
||||
.se_header = "Symbol",
|
||||
.se_cmp = sort__sym_cmp,
|
||||
.se_snprintf = hist_entry__sym_snprintf,
|
||||
.se_width_idx = HISTC_SYMBOL,
|
||||
};
|
||||
|
||||
struct sort_entry sort_parent = {
|
||||
.se_header = "Parent symbol",
|
||||
.se_cmp = sort__parent_cmp,
|
||||
.se_snprintf = hist_entry__parent_snprintf,
|
||||
.se_width = &parent_symbol__col_width,
|
||||
.se_width_idx = HISTC_PARENT,
|
||||
};
|
||||
|
||||
struct sort_entry sort_cpu = {
|
||||
.se_header = "CPU",
|
||||
.se_cmp = sort__cpu_cmp,
|
||||
.se_snprintf = hist_entry__cpu_snprintf,
|
||||
.se_width = &cpus__col_width,
|
||||
.se_width_idx = HISTC_CPU,
|
||||
};
|
||||
|
||||
struct sort_dimension {
|
||||
|
Reference in New Issue
Block a user