Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754493AbZISI3e (ORCPT ); Sat, 19 Sep 2009 04:29:34 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751903AbZISI3d (ORCPT ); Sat, 19 Sep 2009 04:29:33 -0400 Received: from casper.infradead.org ([85.118.1.10]:55372 "EHLO casper.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751313AbZISI3c (ORCPT ); Sat, 19 Sep 2009 04:29:32 -0400 Date: Sat, 19 Sep 2009 10:29:34 +0200 From: Arjan van de Ven To: linux-kernel@vger.kernel.org Cc: mingo@elte.hu, fweisbec@gmail.com, lizf@cn.fujitsu.com, peterz@infradead.org Subject: [git pull] timechart Message-ID: <20090919102934.5fbf65eb@infradead.org> Organization: Intel X-Mailer: Claws Mail 3.7.2 (GTK+ 2.14.7; i386-redhat-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-SRS-Rewrite: SMTP reverse-path rewritten from by casper.infradead.org See http://www.infradead.org/rpr.html Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3272 Lines: 80 The following changes since commit 4a1eaf7626e795a1ee529486a4f038eee2aa0353: Ingo Molnar (1): Merge branch 'x86/urgent' are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/arjan/linux-2.6-timechart master Arjan van de Ven (8): perf: Add a timestamp to fork events perf: Store trace event name/id pairs in perf.data perf: Allow perf utilities to have "callback" options without arguments perf: Add a sample_event type to the event_union trace: Convert the power tracer into an event tracer perf: Add a SVG helper library file perf: Add a perf record --timechart option perf: Add the timechart tool Documentation/trace/power.txt | 17 - arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c | 7 +- arch/x86/kernel/process.c | 28 +- include/linux/perf_counter.h | 2 + include/trace/events/power.h | 81 ++ kernel/perf_counter.c | 11 +- kernel/trace/Makefile | 2 +- kernel/trace/power-traces.c | 20 + kernel/trace/trace.h | 3 - kernel/trace/trace_entries.h | 17 - kernel/trace/trace_power.c | 218 ------ scripts/tracing/power.pl | 108 --- tools/perf/Makefile | 8 + tools/perf/builtin-record.c | 28 + tools/perf/builtin-timechart.c | 1120 ++++++++++++++++++++++++++++ tools/perf/builtin.h | 1 + tools/perf/perf.c | 1 + tools/perf/util/event.h | 8 + tools/perf/util/header.c | 59 ++ tools/perf/util/header.h | 6 + tools/perf/util/parse-events.c | 25 + tools/perf/util/parse-options.h | 2 + tools/perf/util/svghelper.c | 382 ++++++++++ tools/perf/util/svghelper.h | 25 + 24 files changed, 1789 insertions(+), 390 deletions(-) delete mode 100644 Documentation/trace/power.txt create mode 100644 include/trace/events/power.h create mode 100644 kernel/trace/power-traces.c delete mode 100644 kernel/trace/trace_power.c delete mode 100644 scripts/tracing/power.pl create mode 100644 tools/perf/builtin-timechart.c create mode 100644 tools/perf/util/svghelper.c create mode 100644 tools/perf/util/svghelper.h Change since last post: diff -u b/kernel/perf_counter.c b/kernel/perf_counter.c --- b/kernel/perf_counter.c +++ b/kernel/perf_counter.c @@ -3107,7 +3107,7 @@ task_event->event.tid = perf_counter_tid(counter, task); task_event->event.ptid = perf_counter_tid(counter, current); - task_event->event.time = sched_clock(); + task_event->event.time = perf_clock(); perf_output_put(&handle, task_event->event); -- Arjan van de Ven Intel Open Source Technology Centre For development, discussion and tips for power savings, visit http://www.lesswatts.org -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/