Merge branch 'perf/urgent' into perf/core
Merge reason: We'll be queueing dependent changes. Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
@@ -464,7 +464,7 @@ static void print_sym_table(void)
|
||||
struct sym_entry *syme, *n;
|
||||
struct rb_root tmp = RB_ROOT;
|
||||
struct rb_node *nd;
|
||||
int sym_width = 0, dso_width = 0, max_dso_width;
|
||||
int sym_width = 0, dso_width = 0, dso_short_width = 0;
|
||||
const int win_width = winsize.ws_col - 1;
|
||||
|
||||
samples = userspace_samples = exact_samples = 0;
|
||||
@@ -555,15 +555,20 @@ static void print_sym_table(void)
|
||||
if (syme->map->dso->long_name_len > dso_width)
|
||||
dso_width = syme->map->dso->long_name_len;
|
||||
|
||||
if (syme->map->dso->short_name_len > dso_short_width)
|
||||
dso_short_width = syme->map->dso->short_name_len;
|
||||
|
||||
if (syme->name_len > sym_width)
|
||||
sym_width = syme->name_len;
|
||||
}
|
||||
|
||||
printed = 0;
|
||||
|
||||
max_dso_width = winsize.ws_col - sym_width - 29;
|
||||
if (dso_width > max_dso_width)
|
||||
dso_width = max_dso_width;
|
||||
if (sym_width + dso_width > winsize.ws_col - 29) {
|
||||
dso_width = dso_short_width;
|
||||
if (sym_width + dso_width > winsize.ws_col - 29)
|
||||
sym_width = winsize.ws_col - dso_width - 29;
|
||||
}
|
||||
putchar('\n');
|
||||
if (nr_counters == 1)
|
||||
printf(" samples pcnt");
|
||||
|
Reference in New Issue
Block a user