diff options
| author | Scott Wood <scottwood@freescale.com> | 2014-04-07 23:49:35 (GMT) |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2014-04-07 23:49:35 (GMT) |
| commit | 62b8c978ee6b8d135d9e7953221de58000dba986 (patch) | |
| tree | 683b04b2e627f6710c22c151b23c8cc9a165315e /tools/perf/util/sort.h | |
| parent | 78fd82238d0e5716578c326404184a27ba67fd6e (diff) | |
| download | linux-fsl-qoriq-62b8c978ee6b8d135d9e7953221de58000dba986.tar.xz | |
Rewind v3.13-rc3+ (78fd82238d0e5716) to v3.12
Diffstat (limited to 'tools/perf/util/sort.h')
| -rw-r--r-- | tools/perf/util/sort.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/tools/perf/util/sort.h b/tools/perf/util/sort.h index 43e5ff4..4e80dbd 100644 --- a/tools/perf/util/sort.h +++ b/tools/perf/util/sort.h @@ -22,6 +22,7 @@ #include "parse-events.h" #include "thread.h" +#include "sort.h" extern regex_t parent_regex; extern const char *sort_order; @@ -83,9 +84,7 @@ struct hist_entry { struct he_stat stat; struct map_symbol ms; struct thread *thread; - struct comm *comm; u64 ip; - u64 transaction; s32 cpu; struct hist_entry_diff diff; @@ -146,7 +145,6 @@ enum sort_type { SORT_SRCLINE, SORT_LOCAL_WEIGHT, SORT_GLOBAL_WEIGHT, - SORT_TRANSACTION, /* branch stack specific sort keys */ __SORT_BRANCH_STACK, @@ -155,8 +153,6 @@ enum sort_type { SORT_SYM_FROM, SORT_SYM_TO, SORT_MISPREDICT, - SORT_ABORT, - SORT_IN_TX, /* memory mode specific sort keys */ __SORT_MEMORY_MODE, @@ -179,7 +175,7 @@ struct sort_entry { int64_t (*se_cmp)(struct hist_entry *, struct hist_entry *); int64_t (*se_collapse)(struct hist_entry *, struct hist_entry *); - int (*se_snprintf)(struct hist_entry *he, char *bf, size_t size, + int (*se_snprintf)(struct hist_entry *self, char *bf, size_t size, unsigned int width); u8 se_width_idx; bool elide; |