perf fixes
Linus,
Please pull the latest perf-fixes-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git perf-fixes-for-linus
Thanks,
Ingo
------------------>
Arnaldo Carvalho de Melo (1):
perf hists: Print number of samples, not the period sum
Thomas Renninger (2):
perf timechart: Fix black idle boxes in the title perf timechart: Fix max number of cpus
tools/perf/builtin-timechart.c | 6 +++--- tools/perf/util/hist.c | 7 +++++-- tools/perf/util/svghelper.c | 6 +++--- 3 files changed, 11 insertions(+), 8 deletions(-)
tools/perf/builtin-timechart.c +3 -3
@@ -264,9 +264,6 @@ pid_put_sample(int pid, int type, unsigned int cpu, u64 start, u64 end) c->start_time = start;if (p->start_time ==0 || p->start_time > start) p->start_time = start; - -if (cpu > numcpus) - numcpus = cpu; }#define MAX_CPUS 4096
@@ -511,6 +508,9 @@ static int process_sample_event(event_t *event __used,if (!event_str)return 0 ; +if (sample->cpu > numcpus) + numcpus = sample->cpu; +if (strcmp (event_str,"power:cpu_idle" ) ==0 ) {struct power_processor_entry *ppe = (void *)te;if (ppe->state == (u32 )PWR_EVENT_EXIT )
tools/perf/util/hist.c +5 -2
@@ -585,6 +585,7 @@ int hist_entry__snprintf(struct hist_entry *self, char *s, size_t size, {struct sort_entry *se;u64 period, total, period_sys, period_us, period_guest_sys, period_guest_us; +u64 nr_events;const char *sep = symbol_conf.field_sep;int ret;
@@ -593,6 +594,7 @@ int hist_entry__snprintf(struct hist_entry *self, char *s, size_t size,if (pair_hists) { period = self->pair ? self->pair->period :0 ; + nr_events = self->pair ? self->pair->nr_events :0 ; total = pair_hists->stats.total_period; period_sys = self->pair ? self->pair->period_sys :0 ; period_us = self->pair ? self->pair->period_us :0 ;
@@ -600,6 +602,7 @@ int hist_entry__snprintf(struct hist_entry *self, char *s, size_t size, period_guest_us = self->pair ? self->pair->period_guest_us :0 ; }else { period = self->period; + nr_events = self->nr_events; total = session_total; period_sys = self->period_sys; period_us = self->period_us;
@@ -640,9 +643,9 @@ int hist_entry__snprintf(struct hist_entry *self, char *s, size_t size,if (symbol_conf.show_nr_samples) {if (sep) - ret +=snprintf (s + ret, size - ret,"%c%" PRIu64, *sep, period); + ret +=snprintf (s + ret, size - ret,"%c%" PRIu64, *sep, nr_events);else - ret +=snprintf (s + ret, size - ret,"%11" PRIu64, period); + ret +=snprintf (s + ret, size - ret,"%11" PRIu64, nr_events); }if (pair_hists) {
tools/perf/util/svghelper.c +3 -3
@@ -456,9 +456,9 @@ void svg_legenda(void)return ;svg_legenda_box (0 ,"Running" ,"sample" ); -svg_legenda_box (100 ,"Idle" ,"rect.c1" ); -svg_legenda_box (200 ,"Deeper Idle" ,"rect.c3" ); -svg_legenda_box (350 ,"Deepest Idle" ,"rect.c6" ); +svg_legenda_box (100 ,"Idle" ,"c1" ); +svg_legenda_box (200 ,"Deeper Idle" ,"c3" ); +svg_legenda_box (350 ,"Deepest Idle" ,"c6" );svg_legenda_box (550 ,"Sleeping" ,"process2" );svg_legenda_box (650 ,"Waiting for cpu" ,"waiting" );svg_legenda_box (800 ,"Blocked on IO" ,"blocked" );