perf hist: Move histogram related code to hist.h
Namhyung Kim
maintainerPATCH v2 1/3 perf hist: Move histogram related code to hist.h
It's strange that sort.h has the definition of struct hist_entry. As sort.h already includes hist.h, let's move the data structure to hist.h.
--- tools/perf/util/hist.h | 191 +++++++++++++++++++++++++++++++++++++-- tools/perf/util/sort.h | 188 -------------------------------------- tools/perf/util/values.h | 1 + 3 files changed, 184 insertions(+), 196 deletions(-)
tools/perf/util/hist.h +183 -8
@@ -4,21 +4,22 @@#include <linux/rbtree.h> #include <linux/types.h> -#include "evsel.h" +#include "callchain.h" #include "color.h" #include "events_stats.h" +#include "evsel.h" +#include "map_symbol.h" #include "mutex.h" +#include "sample.h" +#include "spark.h" +#include "stat.h" -struct hist_entry ; -struct hist_entry_ops ;struct addr_location ; -struct map_symbol ;struct mem_info ;struct kvm_info ;struct branch_info ;struct branch_stack ;struct block_info ; -struct symbol ;struct ui_progress ;enum hist_filter {
@@ -150,6 +151,159 @@ extern const struct hist_iter_ops hist_iter_branch;extern const struct hist_iter_ops hist_iter_mem;extern const struct hist_iter_ops hist_iter_cumulative; +struct res_sample { +u64 time; +int cpu; +int tid; +}; + +struct he_stat { +u64 period; +u64 period_sys; +u64 period_us; +u64 period_guest_sys; +u64 period_guest_us; +u32 nr_events; +}; + +struct namespace_id { +u64 dev; +u64 ino; +}; + +struct hist_entry_diff { +bool computed; +union { +/* PERF_HPP__DELTA */ +double period_ratio_delta; + +/* PERF_HPP__RATIO */ +double period_ratio; + +/* HISTC_WEIGHTED_DIFF */ +s64 wdiff; + +/* PERF_HPP_DIFF__CYCLES */ +s64 cycles; + }; +struct stats stats; +unsigned long svals[NUM_SPARKS ]; +}; + +struct hist_entry_ops { +void *(*new)(size_t size); +void (*free)(void *ptr); +}; + +/** +* struct hist_entry - histogram entry +* +* @row_offset - offset from the first callchain expanded to appear on screen +* @nr_rows - rows expanded in callchain, recalculated on folding/unfolding +*/ +struct hist_entry { +struct rb_node rb_node_in; +struct rb_node rb_node; +union { +struct list_head node; +struct list_head head; + } pairs; +struct he_stat stat; +struct he_stat *stat_acc; +struct map_symbol ms; +struct thread *thread; +struct comm *comm; +struct namespace_id cgroup_id; +u64 cgroup; +u64 ip; +u64 transaction; +s32 socket; +s32 cpu; +u64 code_page_size; +u64 weight; +u64 ins_lat; +u64 p_stage_cyc; +u8 cpumode; +u8 depth; +int mem_type_off; +struct simd_flags simd_flags; + +/* We are added by hists__add_dummy_entry. */ +bool dummy; +bool leaf; + +char level; +u8 filtered; + +u16 callchain_size; +union { +/* +* Since perf diff only supports the stdio output, TUI +* fields are only accessed from perf report (or perf +* top). So make it a union to reduce memory usage. +*/ +struct hist_entry_diff diff; +struct /* for TUI */ { +u16 row_offset; +u16 nr_rows; +bool init_have_children; +bool unfolded; +bool has_children; +bool has_no_entry; + }; + }; +char *srcline; +char *srcfile; +struct symbol *parent; +struct branch_info *branch_info; +long time; +struct hists *hists; +struct mem_info *mem_info; +struct block_info *block_info; +struct kvm_info *kvm_info; +void *raw_data; +u32 raw_size; +int num_res; +struct res_sample *res_samples; +void *trace_output; +struct perf_hpp_list *hpp_list; +struct hist_entry *parent_he; +struct hist_entry_ops *ops; +struct annotated_data_type *mem_type; +union { +/* this is for hierarchical entry structure */ +struct { +struct rb_root_cached hroot_in; +struct rb_root_cached hroot_out; + };/* non-leaf entries */ +struct rb_root sorted_chain;/* leaf entry has callchains */ + }; +struct callchain_root callchain[0 ];/* must be last member */ +}; + +static __pure inline bool hist_entry__has_callchains (struct hist_entry *he) +{ +return he->callchain_size !=0 ; +} + +static inline bool hist_entry__has_pairs (struct hist_entry *he) +{ +return !list_empty (&he->pairs.node); +} + +static inline struct hist_entry *hist_entry__next_pair (struct hist_entry *he) +{ +if (hist_entry__has_pairs (he)) + return list_entry(he->pairs.node.next, struct hist_entry, pairs.node); +return NULL ; +} + +static inline void hist_entry__add_pair (struct hist_entry *pair, +struct hist_entry *he) +{ +list_add_tail (&pair->pairs.node, &he->pairs.head); +} + struct hist_entry *hists__add_entry(struct hists *hists, struct addr_location *al, struct symbol *parent,
@@ -186,6 +340,8 @@ int hist_entry__sort_snprintf(struct hist_entry *he, char *bf, size_t size, struct hists *hists);int hist_entry__snprintf_alignment (struct hist_entry *he,struct perf_hpp *hpp,struct perf_hpp_fmt *fmt,int printed); +int hist_entry__sym_snprintf (struct hist_entry *he,char *bf,size_t size, +unsigned int width);void hist_entry__delete (struct hist_entry *he);typedef int (*hists__resort_cb_t )(struct hist_entry *he,void *arg);
@@ -238,6 +394,20 @@ void hists__match(struct hists *leader, struct hists *other);int hists__link (struct hists *leader,struct hists *other);int hists__unlink (struct hists *hists); +static inline float hist_entry__get_percent_limit (struct hist_entry *he) +{ +u64 period = he->stat.period; +u64 total_period =hists__total_period (he->hists); + +if (unlikely (total_period ==0 )) +return 0 ; + +if (symbol_conf.cumulate_callchain) + period = he->stat_acc->period; + +return period *100.0 / total_period; +} +struct hists_evsel {struct evsel evsel;struct hists hists;
@@ -460,15 +630,20 @@ struct hist_browser_timer {int refresh; }; -struct res_sample ; -enum rstype {A_NORMAL ,A_ASM ,A_SOURCE }; -struct block_hist ; +struct block_hist { +struct hists block_hists; +struct perf_hpp_list block_list; +struct perf_hpp_fmt block_fmt; +int block_idx; +bool valid; +struct hist_entry he; +};#ifdef HAVE_SLANG_SUPPORT #include "../ui/keysyms.h"
tools/perf/util/sort.h +0 -188
209 lines not on this page · raw message
tools/perf/util/values.h +1 -0
@@ -2,6 +2,7 @@#ifndef __PERF_VALUES_H#define __PERF_VALUES_H +#include <stdio.h> #include <linux/types.h> struct perf_read_values {
Signature · 1 line
2.44.0.683.g7961c838ac-goog
Namhyung Kim
maintainerPATCH v2 2/3 perf hist: Add weight fields to hist entry stats
Like period and sample numbers, it'd be better to track weight values and display them in the output rather than having them as sort keys.
This patch just adds a few more fields to save the weights in a hist entry. It'll be displayed as new output fields in the later patch.
--- tools/perf/util/hist.c | 12 ++++++++++-- tools/perf/util/hist.h | 3 +++ 2 files changed, 13 insertions(+), 2 deletions(-)
tools/perf/util/hist.c +10 -2
@@ -308,6 +308,9 @@ static void he_stat__add_stat(struct he_stat *dest, struct he_stat *src) dest->period_us += src->period_us; dest->period_guest_sys += src->period_guest_sys; dest->period_guest_us += src->period_guest_us; + dest->weight1 += src->weight1; + dest->weight2 += src->weight2; + dest->weight3 += src->weight3; dest->nr_events += src->nr_events; }
@@ -315,7 +318,9 @@ static void he_stat__decay(struct he_stat *he_stat) { he_stat->period = (he_stat->period *7 ) /8 ; he_stat->nr_events = (he_stat->nr_events *7 ) /8 ; -/* XXX need decay for weight too? */ + he_stat->weight1 = (he_stat->weight1 *7 ) /8 ; + he_stat->weight2 = (he_stat->weight2 *7 ) /8 ; + he_stat->weight3 = (he_stat->weight3 *7 ) /8 ; }static void hists__delete_entry (struct hists *hists,struct hist_entry *he);
@@ -614,7 +619,7 @@ static struct hist_entry *hists__findnew_entry(struct hists *hists, cmp =hist_entry__cmp (he, entry);if (!cmp) {if (sample_self) { -he_stat__add_period (&he->stat, period); +he_stat__add_stat (&he->stat, &entry->stat);hist_entry__add_callchain_period (he, period); }if (symbol_conf.cumulate_callchain)
@@ -731,6 +736,9 @@ __hists__add_entry(struct hists *hists, .stat = { .nr_events = 1, .period = sample->period, + .weight1 = sample->weight, + .weight2 = sample->ins_lat, + .weight3 = sample->p_stage_cyc, }, .parent = sym_parent, .filtered = symbol__parent_filter(sym_parent) | al->filtered,
tools/perf/util/hist.h +3 -0
@@ -163,6 +163,9 @@ struct he_stat {u64 period_us;u64 period_guest_sys;u64 period_guest_us; +u64 weight1; +u64 weight2; +u64 weight3;u32 nr_events; };
Signature · 1 line
2.44.0.683.g7961c838ac-goog
Namhyung Kim
maintainerPATCH v2 3/3 perf report: Add weight[123] output fields
In reply to Namhyung KimAdd weight1, weight2 and weight3 fields to -F/--fields and their aliases like 'ins_lat', 'p_stage_cyc' and 'retire_lat'. Note that they are in the sort keys too but the difference is that output fields will sum up the weight values and display the average.
In the sort key, users can see the distribution of weight value and I think it's confusing we have local vs. global weight for the same weight.
For example, I experiment with mem-loads events to get the weights. On my laptop, it seems only weight1 field is supported.
$ perf mem record -- perf test -w noploop
Let's look at the noploop function only. It has 7 samples.
$ perf script -F event,ip,sym,weight | grep noploop # event weight ip sym cpu/mem-loads,ldlat=30/P: 43 55b3c122bffc noploop cpu/mem-loads,ldlat=30/P: 48 55b3c122bffc noploop cpu/mem-loads,ldlat=30/P: 38 55b3c122bffc noploop <--- same weight cpu/mem-loads,ldlat=30/P: 38 55b3c122bffc noploop <--- same weight cpu/mem-loads,ldlat=30/P: 59 55b3c122bffc noploop cpu/mem-loads,ldlat=30/P: 33 55b3c122bffc noploop cpu/mem-loads,ldlat=30/P: 38 55b3c122bffc noploop <--- same weight
When you use the 'weight' sort key, it'd show entries with a separate weight value separately. Also note that the first entry has 3 samples with weight value 38, so they are displayed together and the weight value is the sum of 3 samples (114 = 38 * 3).
$ perf report -n -s +weight | grep -e Weight -e noploop
# Overhead Samples Command Shared Object Symbol Weight
0.53% 3 perf perf [.] noploop 114
0.18% 1 perf perf [.] noploop 59
0.18% 1 perf perf [.] noploop 48
0.18% 1 perf perf [.] noploop 43
0.18% 1 perf perf [.] noploop 33If you use 'local_weight' sort key, you can see the actualy weight.
$ perf report -n -s +local_weight | grep -e Weight -e noploop
# Overhead Samples Command Shared Object Symbol Local Weight
0.53% 3 perf perf [.] noploop 38
0.18% 1 perf perf [.] noploop 59
0.18% 1 perf perf [.] noploop 48
0.18% 1 perf perf [.] noploop 43
0.18% 1 perf perf [.] noploop 33But when you use the -F/--field option instead, you can see the average weight for the while noploop function (as it won't group samples by weight value and use the default 'comm,dso,sym' sort keys).
$ perf report -n -F +weight | grep -e Weight -e noploop
Warning:
--fields weight shows the average value unlike in the --sort key.
# Overhead Samples Weight1 Command Shared Object Symbol
1.23% 7 42.4 perf perf [.] noploopThe weight1 field shows the average value:
(38 * 3 + 59 + 48 + 43 + 33) / 7 = 42.4
Also it'd show the warning that 'weight' field has the average value. Using 'weight1' can remove the warning.
---
v2) shows the warning when 'weight' field is used (Kan)
tools/perf/Documentation/perf-report.txt | 9 ++- tools/perf/ui/hist.c | 92 +++++++++++++++++++----- tools/perf/util/hist.h | 15 +++- tools/perf/util/sort.c | 28 +++++--- tools/perf/util/sort.h | 2 +- 5 files changed, 115 insertions(+), 31 deletions(-)
tools/perf/Documentation/perf-report.txt +8 -1
@@ -121,6 +121,9 @@ OPTIONS - type: Data type of sample memory access. - typeoff: Offset in the data type of sample memory access. - symoff: Offset in the symbol. + - weight1: Average value of event specific weight (1st field of weight_struct). + - weight2: Average value of event specific weight (2nd field of weight_struct). + - weight3: Average value of event specific weight (3rd field of weight_struct). By default, comm, dso and symbol keys are used. (i.e. --sort comm,dso,symbol)
@@ -198,7 +201,11 @@ OPTIONS --fields=:: Specify output field - multiple keys can be specified in CSV format. Following fields are available: - overhead, overhead_sys, overhead_us, overhead_children, sample and period. + overhead, overhead_sys, overhead_us, overhead_children, sample, period, + weight1, weight2, weight3, ins_lat, p_stage_cyc and retire_lat. The + last 3 names are alias for the corresponding weights. When the weight + fields are used, they will show the average value of the weight. + Also it can contain any sort key(s). By default, every sort keys not specified in -F will be appended
tools/perf/ui/hist.c +74 -18
239 lines not on this page · raw message
tools/perf/util/hist.h +13 -2
@@ -550,6 +550,9 @@ enum {PERF_HPP__OVERHEAD_ACC ,PERF_HPP__SAMPLES ,PERF_HPP__PERIOD , +PERF_HPP__WEIGHT1 , +PERF_HPP__WEIGHT2 , +PERF_HPP__WEIGHT3 , PERF_HPP__MAX_INDEX };
@@ -596,16 +599,24 @@ void perf_hpp__reset_sort_width(struct perf_hpp_fmt *fmt, struct hists *hists);void perf_hpp__set_user_width (const char *width_list_str);void hists__reset_column_width (struct hists *hists); +enum perf_hpp_fmt_type { +PERF_HPP_FMT_TYPE__RAW , +PERF_HPP_FMT_TYPE__PERCENT , +PERF_HPP_FMT_TYPE__AVERAGE , +}; +typedef u64 (*hpp_field_fn )(struct hist_entry *he);typedef int (*hpp_callback_fn )(struct perf_hpp *hpp,bool front);typedef int (*hpp_snprint_fn )(struct perf_hpp *hpp,const char *fmt, ...);int hpp__fmt (struct perf_hpp_fmt *fmt,struct perf_hpp *hpp,struct hist_entry *he,hpp_field_fn get_field, -const char *fmtstr,hpp_snprint_fn print_fn,bool fmt_percent); +const char *fmtstr,hpp_snprint_fn print_fn, +enum perf_hpp_fmt_type fmtype);int hpp__fmt_acc (struct perf_hpp_fmt *fmt,struct perf_hpp *hpp,struct hist_entry *he,hpp_field_fn get_field, -const char *fmtstr,hpp_snprint_fn print_fn,bool fmt_percent); +const char *fmtstr,hpp_snprint_fn print_fn, +enum perf_hpp_fmt_type fmtype);static inline void advance_hpp (struct perf_hpp *hpp,int inc) {
tools/perf/util/sort.c +19 -9
@@ -2441,6 +2441,13 @@ static struct hpp_dimension hpp_sort_dimensions[] = {DIM (PERF_HPP__OVERHEAD_ACC ,"overhead_children" ),DIM (PERF_HPP__SAMPLES ,"sample" ),DIM (PERF_HPP__PERIOD ,"period" ), +DIM (PERF_HPP__WEIGHT1 ,"weight1" ), +DIM (PERF_HPP__WEIGHT2 ,"weight2" ), +DIM (PERF_HPP__WEIGHT3 ,"weight3" ), +/* aliases for weight_struct */ +DIM (PERF_HPP__WEIGHT2 ,"ins_lat" ), +DIM (PERF_HPP__WEIGHT3 ,"retire_lat" ), + DIM(PERF_HPP__WEIGHT3, "p_stage_cyc"), };#undef DIM
@@ -3743,26 +3750,29 @@ void sort__setup_elide(FILE *output) } } -int output_field_add (struct perf_hpp_list *list,char *tok) +int output_field_add (struct perf_hpp_list *list,const char *tok) {unsigned int i; -for (i =0 ; i <ARRAY_SIZE (common_sort_dimensions); i++) { -struct sort_dimension *sd = &common_sort_dimensions[i]; +for (i =0 ; i <ARRAY_SIZE (hpp_sort_dimensions); i++) { +struct hpp_dimension *hd = &hpp_sort_dimensions[i]; -if (!sd->name ||strncasecmp (tok, sd->name,strlen (tok))) +if (strncasecmp (tok, hd->name,strlen (tok)))continue ; -return __sort_dimension__add_output (list, sd); +if (!strcasecmp (tok,"weight" )) +ui__warning ("--fields weight shows the average value unlike in the --sort key.\n" ); + +return __hpp_dimension__add_output (list, hd); } -for (i =0 ; i <ARRAY_SIZE (hpp_sort_dimensions); i++) { -struct hpp_dimension *hd = &hpp_sort_dimensions[i]; +for (i =0 ; i <ARRAY_SIZE (common_sort_dimensions); i++) { +struct sort_dimension *sd = &common_sort_dimensions[i]; -if (strncasecmp (tok, hd->name,strlen (tok))) +if (!sd->name ||strncasecmp (tok, sd->name,strlen (tok)))continue ; -return __hpp_dimension__add_output (list, hd); +return __sort_dimension__add_output (list, sd); }for (i =0 ; i <ARRAY_SIZE (bstack_sort_dimensions); i++) {
tools/perf/util/sort.h +1 -1
@@ -141,7 +141,7 @@ void reset_dimensions(void);int sort_dimension__add (struct perf_hpp_list *list,const char *tok,struct evlist *evlist,int level); -int output_field_add (struct perf_hpp_list *list,char *tok); +int output_field_add (struct perf_hpp_list *list,const char *tok);int64_t sort__iaddr_cmp (struct hist_entry *left,struct hist_entry *right);int64_t
Signature · 1 line
2.44.0.683.g7961c838ac-goog
Quoted 2 lines · Namhyung Kim
It's strange that
sort.hhas the definition of structhist_entry. Assort.halready includeshist.h, let's move the data structure tohist.h.
Thanks, applied the three patches.
- Arnaldo
Quoted 483 lines
Signed-off-by Namhyung Kim <[email protected]>--- tools/perf/util/hist.h | 191 +++++++++++++++++++++++++++++++++++++-- tools/perf/util/sort.h | 188 -------------------------------------- tools/perf/util/values.h | 1 + 3 files changed, 184 insertions(+), 196 deletions(-)tools/perf/util/hist.h +183
-8@@ -4,21 +4,22 @@#include <linux/rbtree.h> #include <linux/types.h> -#include "evsel.h" +#include "callchain.h" #include "color.h" #include "events_stats.h" +#include "evsel.h" +#include "map_symbol.h" #include "mutex.h" +#include "sample.h" +#include "spark.h" +#include "stat.h" -struct hist_entry ; -struct hist_entry_ops ;struct addr_location ; -struct map_symbol ;struct mem_info ;struct kvm_info ;struct branch_info ;struct branch_stack ;struct block_info ; -struct symbol ;struct ui_progress ;enum hist_filter {@@ -150,6 +151,159 @@ extern const struct hist_iter_ops hist_iter_branch;extern const struct hist_iter_ops hist_iter_mem;extern const struct hist_iter_ops hist_iter_cumulative; +struct res_sample { +u64 time; +int cpu; +int tid; +}; + +struct he_stat { +u64 period; +u64 period_sys; +u64 period_us; +u64 period_guest_sys; +u64 period_guest_us; +u32 nr_events; +}; + +struct namespace_id { +u64 dev; +u64 ino; +}; + +struct hist_entry_diff { +bool computed; +union { +/* PERF_HPP__DELTA */ +double period_ratio_delta; + +/* PERF_HPP__RATIO */ +double period_ratio; + +/* HISTC_WEIGHTED_DIFF */ +s64 wdiff; + +/* PERF_HPP_DIFF__CYCLES */ +s64 cycles; + }; +struct stats stats; +unsigned long svals[NUM_SPARKS ]; +}; + +struct hist_entry_ops { +void *(*new)(size_t size); +void (*free)(void *ptr); +}; + +/** +* struct hist_entry - histogram entry +* +* @row_offset - offset from the first callchain expanded to appear on screen +* @nr_rows - rows expanded in callchain, recalculated on folding/unfolding +*/ +struct hist_entry { +struct rb_node rb_node_in; +struct rb_node rb_node; +union { +struct list_head node; +struct list_head head; + } pairs; +struct he_stat stat; +struct he_stat *stat_acc; +struct map_symbol ms; +struct thread *thread; +struct comm *comm; +struct namespace_id cgroup_id; +u64 cgroup; +u64 ip; +u64 transaction; +s32 socket; +s32 cpu; +u64 code_page_size; +u64 weight; +u64 ins_lat; +u64 p_stage_cyc; +u8 cpumode; +u8 depth; +int mem_type_off; +struct simd_flags simd_flags; + +/* We are added by hists__add_dummy_entry. */ +bool dummy; +bool leaf; + +char level; +u8 filtered; + +u16 callchain_size; +union { +/* +* Since perf diff only supports the stdio output, TUI +* fields are only accessed from perf report (or perf +* top). So make it a union to reduce memory usage. +*/ +struct hist_entry_diff diff; +struct /* for TUI */ { +u16 row_offset; +u16 nr_rows; +bool init_have_children; +bool unfolded; +bool has_children; +bool has_no_entry; + }; + }; +char *srcline; +char *srcfile; +struct symbol *parent; +struct branch_info *branch_info; +long time; +struct hists *hists; +struct mem_info *mem_info; +struct block_info *block_info; +struct kvm_info *kvm_info; +void *raw_data; +u32 raw_size; +int num_res; +struct res_sample *res_samples; +void *trace_output; +struct perf_hpp_list *hpp_list; +struct hist_entry *parent_he; +struct hist_entry_ops *ops; +struct annotated_data_type *mem_type; +union { +/* this is for hierarchical entry structure */ +struct { +struct rb_root_cached hroot_in; +struct rb_root_cached hroot_out; + };/* non-leaf entries */ +struct rb_root sorted_chain;/* leaf entry has callchains */ + }; +struct callchain_root callchain[0 ];/* must be last member */ +}; + +static __pure inline bool hist_entry__has_callchains (struct hist_entry *he) +{ +return he->callchain_size !=0 ; +} + +static inline bool hist_entry__has_pairs (struct hist_entry *he) +{ +return !list_empty (&he->pairs.node); +} + +static inline struct hist_entry *hist_entry__next_pair (struct hist_entry *he) +{ +if (hist_entry__has_pairs (he)) + return list_entry(he->pairs.node.next, struct hist_entry, pairs.node); +return NULL ; +} + +static inline void hist_entry__add_pair (struct hist_entry *pair, +struct hist_entry *he) +{ +list_add_tail (&pair->pairs.node, &he->pairs.head); +} + struct hist_entry *hists__add_entry(struct hists *hists, struct addr_location *al, struct symbol *parent,@@ -186,6 +340,8 @@ int hist_entry__sort_snprintf(struct hist_entry *he, char *bf, size_t size, struct hists *hists);int hist_entry__snprintf_alignment (struct hist_entry *he,struct perf_hpp *hpp,struct perf_hpp_fmt *fmt,int printed); +int hist_entry__sym_snprintf (struct hist_entry *he,char *bf,size_t size, +unsigned int width);void hist_entry__delete (struct hist_entry *he);typedef int (*hists__resort_cb_t )(struct hist_entry *he,void *arg);@@ -238,6 +394,20 @@ void hists__match(struct hists *leader, struct hists *other);int hists__link (struct hists *leader,struct hists *other);int hists__unlink (struct hists *hists); +static inline float hist_entry__get_percent_limit (struct hist_entry *he) +{ +u64 period = he->stat.period; +u64 total_period =hists__total_period (he->hists); + +if (unlikely (total_period ==0 )) +return 0 ; + +if (symbol_conf.cumulate_callchain) + period = he->stat_acc->period; + +return period *100.0 / total_period; +} +struct hists_evsel {struct evsel evsel;struct hists hists;@@ -460,15 +630,20 @@ struct hist_browser_timer {int refresh; }; -struct res_sample ; -enum rstype {A_NORMAL ,A_ASM ,A_SOURCE }; -struct block_hist ; +struct block_hist { +struct hists block_hists; +struct perf_hpp_list block_list; +struct perf_hpp_fmt block_fmt; +int block_idx; +bool valid; +struct hist_entry he; +};#ifdef HAVE_SLANG_SUPPORT #include "../ui/keysyms.h" tools/perf/util/sort.h +0
-188@@ -3,19 +3,9 @@#define __PERF_SORT_H#include <regex.h> #include <stdbool.h> -#include <linux/list.h> -#include <linux/rbtree.h> -#include "map_symbol.h" -#include "symbol_conf.h" -#include "callchain.h" -#include "values.h" #include "hist.h" -#include "stat.h" -#include "spark.h" struct option ; -struct thread ; -struct annotated_data_type ;extern regex_t parent_regex;extern const char *sort_order;@@ -39,175 +29,6 @@ extern struct sort_entry sort_type;extern const char default_mem_sort_order[];extern bool chk_double_cl; -struct res_sample { -u64 time; -int cpu; -int tid; -}; - -struct he_stat { -u64 period; -u64 period_sys; -u64 period_us; -u64 period_guest_sys; -u64 period_guest_us; -u32 nr_events; -}; - -struct namespace_id { -u64 dev; -u64 ino; -}; - -struct hist_entry_diff { -bool computed; -union { -/* PERF_HPP__DELTA */ -double period_ratio_delta; - -/* PERF_HPP__RATIO */ -double period_ratio; - -/* HISTC_WEIGHTED_DIFF */ -s64 wdiff; - -/* PERF_HPP_DIFF__CYCLES */ -s64 cycles; - }; -struct stats stats; -unsigned long svals[NUM_SPARKS ]; -}; - -struct hist_entry_ops { -void *(*new)(size_t size); -void (*free)(void *ptr); -}; - -/** -* struct hist_entry - histogram entry -* -* @row_offset - offset from the first callchain expanded to appear on screen -* @nr_rows - rows expanded in callchain, recalculated on folding/unfolding -*/ -struct hist_entry { -struct rb_node rb_node_in; -struct rb_node rb_node; -union { -struct list_head node; -struct list_head head; - } pairs; -struct he_stat stat; -struct he_stat *stat_acc; -struct map_symbol ms; -struct thread *thread; -struct comm *comm; -struct namespace_id cgroup_id; -u64 cgroup; -u64 ip; -u64 transaction; -s32 socket; -s32 cpu; -u64 code_page_size; -u64 weight; -u64 ins_lat; -u64 p_stage_cyc; -u8 cpumode; -u8 depth; -int mem_type_off; -struct simd_flags simd_flags; - -/* We are added by hists__add_dummy_entry. */ -bool dummy; -bool leaf; - -char level; -u8 filtered; - -u16 callchain_size; -union { -/* -* Since perf diff only supports the stdio output, TUI -* fields are only accessed from perf report (or perf -* top). So make it a union to reduce memory usage. -*/ -struct hist_entry_diff diff; -struct /* for TUI */ { -u16 row_offset; -u16 nr_rows; -bool init_have_children; -bool unfolded; -bool has_children; -bool has_no_entry; - }; - }; -char *srcline; -char *srcfile; -struct symbol *parent; -struct branch_info *branch_info; -long time; -struct hists *hists; -struct mem_info *mem_info; -struct block_info *block_info; -struct kvm_info *kvm_info; -void *raw_data; -u32 raw_size; -int num_res; -struct res_sample *res_samples; -void *trace_output; -struct perf_hpp_list *hpp_list; -struct hist_entry *parent_he; -struct hist_entry_ops *ops; -struct annotated_data_type *mem_type; -union { -/* this is for hierarchical entry structure */ -struct { -struct rb_root_cached hroot_in; -struct rb_root_cached hroot_out; - };/* non-leaf entries */ -struct rb_root sorted_chain;/* leaf entry has callchains */ - }; -struct callchain_root callchain[0 ];/* must be last member */ -}; - -static __pure inline bool hist_entry__has_callchains (struct hist_entry *he) -{ -return he->callchain_size !=0 ; -} - -int hist_entry__sym_snprintf (struct hist_entry *he,char *bf,size_t size,unsigned int width); - -static inline bool hist_entry__has_pairs (struct hist_entry *he) -{ -return !list_empty (&he->pairs.node); -} - -static inline struct hist_entry *hist_entry__next_pair (struct hist_entry *he) -{ -if (hist_entry__has_pairs (he)) - return list_entry(he->pairs.node.next, struct hist_entry, pairs.node); -return NULL ; -} - -static inline void hist_entry__add_pair (struct hist_entry *pair, -struct hist_entry *he) -{ -list_add_tail (&pair->pairs.node, &he->pairs.head); -} - -static inline float hist_entry__get_percent_limit (struct hist_entry *he) -{ -u64 period = he->stat.period; -u64 total_period =hists__total_period (he->hists); - -if (unlikely (total_period ==0 )) -return 0 ; - -if (symbol_conf.cumulate_callchain) - period = he->stat_acc->period; - -return period *100.0 / total_period; -} -enum sort_mode {SORT_MODE__NORMAL ,SORT_MODE__BRANCH ,@@ -299,15 +120,6 @@ struct sort_entry {u8 se_width_idx; }; -struct block_hist { -struct hists block_hists; -struct perf_hpp_list block_list; -struct perf_hpp_fmt block_fmt; -int block_idx; -bool valid; -struct hist_entry he; -}; -extern struct sort_entry sort_thread;struct evlist ;tools/perf/util/values.h +1
-0@@ -2,6 +2,7 @@#ifndef __PERF_VALUES_H#define __PERF_VALUES_H +#include <stdio.h> #include <linux/types.h> struct perf_read_values {Signature · 1 line
2.44.0.683.g7961c838ac-goog