diff options
Diffstat (limited to 'tools/perf/util/hist.h')
| -rw-r--r-- | tools/perf/util/hist.h | 38 | 
1 files changed, 18 insertions, 20 deletions
diff --git a/tools/perf/util/hist.h b/tools/perf/util/hist.h index f011ad4756e..66cb31fe81d 100644 --- a/tools/perf/util/hist.h +++ b/tools/perf/util/hist.h @@ -98,9 +98,8 @@ void hists__output_recalc_col_len(struct hists *hists, int max_rows);  void hists__inc_nr_events(struct hists *self, u32 type);  size_t hists__fprintf_nr_events(struct hists *self, FILE *fp); -size_t hists__fprintf(struct hists *self, struct hists *pair, -		      bool show_displacement, bool show_header, -		      int max_rows, int max_cols, FILE *fp); +size_t hists__fprintf(struct hists *self, bool show_header, int max_rows, +		      int max_cols, FILE *fp);  int hist_entry__inc_addr_samples(struct hist_entry *self, int evidx, u64 addr);  int hist_entry__annotate(struct hist_entry *self, size_t privsize); @@ -118,9 +117,7 @@ void hists__calc_col_len(struct hists *hists, struct hist_entry *he);  struct perf_hpp {  	char *buf;  	size_t size; -	u64 total_period;  	const char *sep; -	long displacement;  	void *ptr;  }; @@ -135,6 +132,7 @@ struct perf_hpp_fmt {  extern struct perf_hpp_fmt perf_hpp__format[];  enum { +	PERF_HPP__BASELINE,  	PERF_HPP__OVERHEAD,  	PERF_HPP__OVERHEAD_SYS,  	PERF_HPP__OVERHEAD_US, @@ -148,13 +146,22 @@ enum {  	PERF_HPP__MAX_INDEX  }; -void perf_hpp__init(bool need_pair, bool show_displacement); +void perf_hpp__init(void); +void perf_hpp__column_enable(unsigned col, bool enable);  int hist_entry__period_snprintf(struct perf_hpp *hpp, struct hist_entry *he,  				bool color);  struct perf_evlist; -#ifdef NO_NEWT_SUPPORT +#ifdef NEWT_SUPPORT +#include "../ui/keysyms.h" +int hist_entry__tui_annotate(struct hist_entry *he, int evidx, +			     void(*timer)(void *arg), void *arg, int delay_secs); + +int perf_evlist__tui_browse_hists(struct perf_evlist *evlist, const char *help, +				  void(*timer)(void *arg), void *arg, +				  int refresh); +#else  static inline  int perf_evlist__tui_browse_hists(struct perf_evlist *evlist __maybe_unused,  				  const char *help __maybe_unused, @@ -177,17 +184,13 @@ static inline int hist_entry__tui_annotate(struct hist_entry *self  }  #define K_LEFT -1  #define K_RIGHT -2 -#else -#include "../ui/keysyms.h" -int hist_entry__tui_annotate(struct hist_entry *he, int evidx, -			     void(*timer)(void *arg), void *arg, int delay_secs); +#endif -int perf_evlist__tui_browse_hists(struct perf_evlist *evlist, const char *help, +#ifdef GTK2_SUPPORT +int perf_evlist__gtk_browse_hists(struct perf_evlist *evlist, const char *help,  				  void(*timer)(void *arg), void *arg,  				  int refresh); -#endif - -#ifdef NO_GTK2_SUPPORT +#else  static inline  int perf_evlist__gtk_browse_hists(struct perf_evlist *evlist __maybe_unused,  				  const char *help __maybe_unused, @@ -197,11 +200,6 @@ int perf_evlist__gtk_browse_hists(struct perf_evlist *evlist __maybe_unused,  {  	return 0;  } - -#else -int perf_evlist__gtk_browse_hists(struct perf_evlist *evlist, const char *help, -				  void(*timer)(void *arg), void *arg, -				  int refresh);  #endif  unsigned int hists__sort_list_width(struct hists *self);  |