perf_counter tools: Add color terminal output support
Commit-ID: 8fc0321f1ad0ffef969056dda91b453bbd7a494d Gitweb: http://git.kernel.org/tip/8fc0321f1ad0ffef969056dda91b453bbd7a494d Author: Ingo Molnar <[email protected]> AuthorDate: Thu, 4 Jun 2009 15:19:47 +0200 Committer: Ingo Molnar <[email protected]> CommitDate: Thu, 4 Jun 2009 15:28:11 +0200
perf_counter tools: Add color terminal output support
Add Git's color printing library to util/color.[ch].
Add it to perf report, with a trivial example to print high-overhead entries in red, low-overhead entries in green.
Cc: Peter Zijlstra <[email protected]>
Cc: Mike Galbraith <[email protected]>
Cc: Paul Mackerras <[email protected]>
Cc: Arnaldo Carvalho de Melo <[email protected]>
LKML-Reference: <new-submission>
Signed-off-by Ingo Molnar <[email protected]>
--- Documentation/perf_counter/Makefile | 2 + Documentation/perf_counter/builtin-report.c | 15 ++- Documentation/perf_counter/builtin-top.c | 23 ++- Documentation/perf_counter/util/color.c | 230 +++++++++++++++++++++++++ Documentation/perf_counter/util/color.h | 36 ++++ Documentation/perf_counter/util/environment.c | 1 + 6 files changed, 300 insertions(+), 7 deletions(-)
Documentation/perf_counter/Makefile +2 -0
@@ -298,6 +298,7 @@ LIB_H += util/string.h LIB_H += util/run-command.h LIB_H += util/sigchain.h LIB_H += util/symbol.h +LIB_H += util/color.h LIB_OBJS += util/abspath.o LIB_OBJS += util/alias.o
@@ -319,6 +320,7 @@ LIB_OBJS += util/usage.o LIB_OBJS += util/wrapper.o LIB_OBJS += util/sigchain.o LIB_OBJS += util/symbol.o +LIB_OBJS += util/color.o LIB_OBJS += util/pager.o BUILTIN_OBJS += builtin-help.o
Documentation/perf_counter/builtin-report.c +14 -1
@@ -9,6 +9,7 @@#include "util/util.h" +#include "util/color.h" #include "util/list.h" #include "util/cache.h" #include "util/rbtree.h"
@@ -548,7 +549,19 @@ hist_entry__fprintf(FILE *fp, struct hist_entry *self, uint64_t total_samples)size_t ret;if (total_samples) { - ret =fprintf (fp," %6.2f%%" , +double percent = self->count *100.0 / total_samples; +char *color =PERF_COLOR_NORMAL ; + +/* +* We color high-overhead entries in red, low-overhead +* entries in green - and keep the middle ground normal: +*/ +if (percent >=5.0 ) + color =PERF_COLOR_RED ; +if (percent <0.5 ) + color =PERF_COLOR_GREEN ; + + ret =color_fprintf (fp, color," %6.2f%%" , (self->count *100.0 ) / total_samples); }else ret =fprintf (fp,"%12d " , self->count);
Documentation/perf_counter/builtin-top.c +17 -6
@@ -21,6 +21,7 @@#include "perf.h" #include "util/symbol.h" +#include "util/color.h" #include "util/util.h" #include "util/rbtree.h" #include "util/parse-options.h"
@@ -253,7 +254,8 @@ static void print_sym_table(void)for (nd =rb_first (&tmp); nd; nd =rb_next (nd)) { struct sym_entry *syme = rb_entry(nd, struct sym_entry, rb_node);struct symbol *sym = (struct symbol *)(syme +1 ); -float pcnt; +char *color =PERF_COLOR_NORMAL ; +double pcnt;if (++printed > print_entries || syme->snap_count < count_filter)continue ;
@@ -261,13 +263,22 @@ static void print_sym_table(void) pcnt =100.0 - (100.0 * ((sum_kevents - syme->snap_count) / sum_kevents)); +/* +* We color high-overhead entries in red, low-overhead +* entries in green - and keep the middle ground normal: +*/ +if (pcnt >=5.0 ) + color =PERF_COLOR_RED ; +if (pcnt <0.5 ) + color =PERF_COLOR_GREEN ; +if (nr_counters ==1 ) -printf ("%19.2f - %4.1f%% - %016llx : %s\n" , - syme->weight, pcnt, sym->start, sym->name); +printf ("%19.2f - " , syme->weight);else -printf ("%8.1f %10ld - %4.1f%% - %016llx : %s\n" , - syme->weight, syme->snap_count, - pcnt, sym->start, sym->name); +printf ("%8.1f %10ld - " , syme->weight, syme->snap_count); + +color_fprintf (stdout, color,"%4.1f%%" , pcnt); +printf (" - %016llx : %s\n" , sym->start, sym->name); } {
Documentation/perf_counter/util/color.c new file +230 -0
230 lines not on this page · raw message
Documentation/perf_counter/util/color.h new file +36 -0
@@ -0,0 +1,36 @@ +#ifndef COLOR_H +#define COLOR_H + +/* "\033[1;38;5;2xx;48;5;2xxm\0" is 23 bytes */ +#define COLOR_MAXLEN 24 + +#define PERF_COLOR_NORMAL "" +#define PERF_COLOR_RESET "\033[m" +#define PERF_COLOR_BOLD "\033[1m" +#define PERF_COLOR_RED "\033[31m" +#define PERF_COLOR_GREEN "\033[32m" +#define PERF_COLOR_YELLOW "\033[33m" +#define PERF_COLOR_BLUE "\033[34m" +#define PERF_COLOR_MAGENTA "\033[35m" +#define PERF_COLOR_CYAN "\033[36m" +#define PERF_COLOR_BG_RED "\033[41m" + +/* +* This variable stores the value of color.ui +*/ +extern int perf_use_color_default; + + +/* +* Use this instead of perf_default_config if you need the value of color.ui. +*/ +int perf_color_default_config (const char *var,const char *value,void *cb); + +int perf_config_colorbool (const char *var,const char *value,int stdout_is_tty); +void color_parse (const char *value,const char *var,char *dst); +void color_parse_mem (const char *value,int len,const char *var,char *dst); +int color_fprintf (FILE *fp,const char *color,const char *fmt, ...); +int color_fprintf_ln (FILE *fp,const char *color,const char *fmt, ...); +int color_fwrite_lines (FILE *fp,const char *color,size_t count,const char *buf); + +#endif /* COLOR_H */
Documentation/perf_counter/util/environment.c +1 -0
@@ -6,3 +6,4 @@#include "cache.h" const char *pager_program; +int pager_use_color =1 ;