On Tue, Dec 24, 2013 at 05:22:15PM +0900, Namhyung Kim wrote:
> From: Namhyung Kim <namhyung....@lge.com>
> 
> Print accumulated stat of a hist entry if requested.
> 
> Cc: Arun Sharma <asha...@fb.com>
> Cc: Frederic Weisbecker <fweis...@gmail.com>
> Signed-off-by: Namhyung Kim <namhy...@kernel.org>
> ---
>  tools/perf/ui/hist.c   | 45 +++++++++++++++++++++++++++++++++++++++++++++
>  tools/perf/util/hist.h |  1 +
>  2 files changed, 46 insertions(+)
> 
> diff --git a/tools/perf/ui/hist.c b/tools/perf/ui/hist.c
> index 78f4c92e9b73..eb9c07bcdb01 100644
> --- a/tools/perf/ui/hist.c
> +++ b/tools/perf/ui/hist.c
> @@ -129,6 +129,28 @@ static int hpp__entry_##_type(struct perf_hpp_fmt *_fmt 
> __maybe_unused,          \
>                         scnprintf, true);                                     
> \
>  }
>  
> +#define __HPP_COLOR_ACC_PERCENT_FN(_type, _field)                            
> \
> +static u64 he_get_acc_##_field(struct hist_entry *he)                        
>         \
> +{                                                                            
> \
> +     return he->stat_acc->_field;                                            
> \
> +}                                                                            
> \
> +                                                                             
> \
> +static int hpp__color_acc_##_type(struct perf_hpp_fmt *fmt __maybe_unused,   
> \
> +                           struct perf_hpp *hpp, struct hist_entry *he)      
> \
> +{                                                                            
> \
> +     return __hpp__fmt(hpp, he, he_get_acc_##_field, " %6.2f%%",             
> \
> +                       (hpp_snprint_fn)percent_color_snprintf, true);        
> \
> +}
> +
> +#define __HPP_ENTRY_ACC_PERCENT_FN(_type, _field)                            
> \
> +static int hpp__entry_acc_##_type(struct perf_hpp_fmt *_fmt __maybe_unused,  
> \
> +                           struct perf_hpp *hpp, struct hist_entry *he)      
> \
> +{                                                                            
> \
> +     const char *fmt = symbol_conf.field_sep ? " %.2f" : " %6.2f%%";         
> \
> +     return __hpp__fmt(hpp, he, he_get_acc_##_field, fmt,                    
> \
> +                       scnprintf, true);                                     
> \
> +}
> +
>  #define __HPP_ENTRY_RAW_FN(_type, _field)                                    
> \
>  static u64 he_get_raw_##_field(struct hist_entry *he)                        
>         \
>  {                                                                            
> \
> @@ -148,17 +170,25 @@ __HPP_WIDTH_FN(_type, _min_width, _unit_width)          
>                 \
>  __HPP_COLOR_PERCENT_FN(_type, _field)                                        
> \
>  __HPP_ENTRY_PERCENT_FN(_type, _field)
>  
> +#define HPP_PERCENT_ACC_FNS(_type, _str, _field, _min_width, _unit_width)\
> +__HPP_HEADER_FN(_type, _str, _min_width, _unit_width)                        
> \
> +__HPP_WIDTH_FN(_type, _min_width, _unit_width)                               
> \
> +__HPP_COLOR_ACC_PERCENT_FN(_type, _field)                            \
> +__HPP_ENTRY_ACC_PERCENT_FN(_type, _field)

how about add 'stat|stat_acc' parameter to the HPP_PERCENT_FNS
macro and use it like:

#define __HPP_COLOR_PERCENT_FN(_type, _field, _stat)                            
\
static u64 he_get_##_stat##_field(struct hist_entry *he)                        
\
{                                                                               
\
        return he->##_stat._field;                                              
\
}                                                                               
\


and use 'he_get_##_stat##_field' in __HPP_ENTRY_PERCENT_FN

This way you dont need to duplicate the code, that differs
only in the used stat data.. but it's possible I missed
something ;-)

btw just noticed __HPP_COLOR_PERCENT_FN does not use _type

jirka
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to