forked from Minki/linux
a4fb581b15
Currently, the callchains are displayed using a constant left
margin. So depending on the current sort dimension
configuration, callchains may appear to be well attached to the
first sort dimension column field which is mostly the case,
except when the first dimension of sorting is done by comm,
because these are right aligned.
This patch binds the callchain to the first letter in the first
column, whatever type of column it is (dso, comm, symbol).
Before:
0.80% perf [k] __lock_acquire
__lock_acquire
lock_acquire
|
|--58.33%-- _spin_lock
| |
| |--28.57%-- inotify_should_send_event
| | fsnotify
| | __fsnotify_parent
After:
0.80% perf [k] __lock_acquire
__lock_acquire
lock_acquire
|
|--58.33%-- _spin_lock
| |
| |--28.57%-- inotify_should_send_event
| | fsnotify
| | __fsnotify_parent
Also, for clarity, we don't put anymore the callchain as is but:
- If we have a top level ancestor in the callchain, start it
with a first ascii hook.
Before:
0.80% perf [kernel] [k] __lock_acquire
__lock_acquire
lock_acquire
|
|--58.33%-- _spin_lock
| |
| |--28.57%-- inotify_should_send_event
| | fsnotify
[..] [..]
After:
0.80% perf [kernel] [k] __lock_acquire
|
--- __lock_acquire
lock_acquire
|
|--58.33%-- _spin_lock
| |
| |--28.57%-- inotify_should_send_event
| | fsnotify
[..] [..]
- Otherwise, if we have several top level ancestors, then
display these like we did before:
1.69% Xorg
|
|--21.21%-- vread_hpet
| 0x7fffd85b46fc
| 0x7fffd85b494d
| 0x7f4fafb4e54d
|
|--15.15%-- exaOffscreenAlloc
|
|--9.09%-- I830WaitLpRing
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Anton Blanchard <anton@samba.org>
LKML-Reference: <1256246604-17156-2-git-send-email-fweisbec@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
100 lines
2.7 KiB
C
100 lines
2.7 KiB
C
#ifndef __PERF_SORT_H
|
|
#define __PERF_SORT_H
|
|
#include "../builtin.h"
|
|
|
|
#include "util.h"
|
|
|
|
#include "color.h"
|
|
#include <linux/list.h>
|
|
#include "cache.h"
|
|
#include <linux/rbtree.h>
|
|
#include "symbol.h"
|
|
#include "string.h"
|
|
#include "callchain.h"
|
|
#include "strlist.h"
|
|
#include "values.h"
|
|
|
|
#include "../perf.h"
|
|
#include "debug.h"
|
|
#include "header.h"
|
|
|
|
#include "parse-options.h"
|
|
#include "parse-events.h"
|
|
|
|
#include "thread.h"
|
|
#include "sort.h"
|
|
|
|
extern regex_t parent_regex;
|
|
extern char *sort_order;
|
|
extern char default_parent_pattern[];
|
|
extern char *parent_pattern;
|
|
extern char default_sort_order[];
|
|
extern int sort__need_collapse;
|
|
extern int sort__has_parent;
|
|
extern char *field_sep;
|
|
extern struct sort_entry sort_comm;
|
|
extern struct sort_entry sort_dso;
|
|
extern struct sort_entry sort_sym;
|
|
extern struct sort_entry sort_parent;
|
|
extern unsigned int dsos__col_width;
|
|
extern unsigned int comms__col_width;
|
|
extern unsigned int threads__col_width;
|
|
extern enum sort_type sort__first_dimension;
|
|
|
|
struct hist_entry {
|
|
struct rb_node rb_node;
|
|
u64 count;
|
|
struct thread *thread;
|
|
struct map *map;
|
|
struct symbol *sym;
|
|
u64 ip;
|
|
char level;
|
|
struct symbol *parent;
|
|
struct callchain_node callchain;
|
|
struct rb_root sorted_chain;
|
|
};
|
|
|
|
enum sort_type {
|
|
SORT_PID,
|
|
SORT_COMM,
|
|
SORT_DSO,
|
|
SORT_SYM,
|
|
SORT_PARENT
|
|
};
|
|
|
|
/*
|
|
* configurable sorting bits
|
|
*/
|
|
|
|
struct sort_entry {
|
|
struct list_head list;
|
|
|
|
const char *header;
|
|
|
|
int64_t (*cmp)(struct hist_entry *, struct hist_entry *);
|
|
int64_t (*collapse)(struct hist_entry *, struct hist_entry *);
|
|
size_t (*print)(FILE *fp, struct hist_entry *, unsigned int width);
|
|
unsigned int *width;
|
|
bool elide;
|
|
};
|
|
|
|
extern struct sort_entry sort_thread;
|
|
extern struct list_head hist_entry__sort_list;
|
|
|
|
extern int repsep_fprintf(FILE *fp, const char *fmt, ...);
|
|
extern size_t sort__thread_print(FILE *, struct hist_entry *, unsigned int);
|
|
extern size_t sort__comm_print(FILE *, struct hist_entry *, unsigned int);
|
|
extern size_t sort__dso_print(FILE *, struct hist_entry *, unsigned int);
|
|
extern size_t sort__sym_print(FILE *, struct hist_entry *, unsigned int __used);
|
|
extern int64_t cmp_null(void *, void *);
|
|
extern int64_t sort__thread_cmp(struct hist_entry *, struct hist_entry *);
|
|
extern int64_t sort__comm_cmp(struct hist_entry *, struct hist_entry *);
|
|
extern int64_t sort__comm_collapse(struct hist_entry *, struct hist_entry *);
|
|
extern int64_t sort__dso_cmp(struct hist_entry *, struct hist_entry *);
|
|
extern int64_t sort__sym_cmp(struct hist_entry *, struct hist_entry *);
|
|
extern int64_t sort__parent_cmp(struct hist_entry *, struct hist_entry *);
|
|
extern size_t sort__parent_print(FILE *, struct hist_entry *, unsigned int);
|
|
extern int sort_dimension__add(const char *);
|
|
|
|
#endif /* __PERF_SORT_H */
|