diff options
author | Ingo Molnar <mingo@elte.hu> | 2011-02-28 14:06:50 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2011-02-28 14:06:50 +0100 |
commit | 6a254c0c7bdfa26245777bee5d63cdfa6bba1ff5 (patch) | |
tree | 6fbc02cbcc77b1d7634b1945824b6b644fbf093e /tools | |
parent | 60a53a163e419a50e5a0f1ebdb4db16ce0978930 (diff) | |
parent | 54b08f5f90feebc9756d96e0c7bf2fdffe4af7c3 (diff) |
Merge branch 'perf/urgent' into auto-latest
Diffstat (limited to 'tools')
-rw-r--r-- | tools/perf/builtin-timechart.c | 6 | ||||
-rw-r--r-- | tools/perf/util/svghelper.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/tools/perf/builtin-timechart.c b/tools/perf/builtin-timechart.c index 0801275c500e..67c0459dc325 100644 --- a/tools/perf/builtin-timechart.c +++ b/tools/perf/builtin-timechart.c @@ -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 @@ -514,6 +511,9 @@ static int process_sample_event(union perf_event *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) diff --git a/tools/perf/util/svghelper.c b/tools/perf/util/svghelper.c index fb737fe9be91..96c866045d60 100644 --- a/tools/perf/util/svghelper.c +++ b/tools/perf/util/svghelper.c @@ -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"); |