Merge branch 'perfcounters-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'perfcounters-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (60 commits)
  perf tools: Avoid unnecessary work in directory lookups
  perf stat: Clean up statistics calculations a bit more
  perf stat: More advanced variance computation
  perf stat: Use stddev_mean in stead of stddev
  perf stat: Remove the limit on repeat
  perf stat: Change noise calculation to use stddev
  x86, perf_counter, bts: Do not allow kernel BTS tracing for now
  x86, perf_counter, bts: Correct pointer-to-u64 casts
  x86, perf_counter, bts: Fail if BTS is not available
  perf_counter: Fix output-sharing error path
  perf trace: Fix read_string()
  perf trace: Print out in nanoseconds
  perf tools: Seek to the end of the header area
  perf trace: Fix parsing of perf.data
  perf trace: Sample timestamps as well
  perf_counter: Introduce new (non-)paranoia level to allow raw tracepoint access
  perf trace: Sample the CPU too
  perf tools: Work around strict aliasing related warnings
  perf tools: Clean up warnings list in the Makefile
  perf tools: Complete support for dynamic strings
  ...

1 files changed, 95 insertions, 0 deletions

diff --git a/tools/perf/util/debug.c b/tools/perf/util/debug.c
new file mode 100644
index 000000000000..e8ca98fe0bd4
--- /dev/null
+++ b/tools/perf/util/debug.c
@@ -0,0 +1,95 @@
+/* For general debugging purposes */
+
+#include "../perf.h"
+
+#include <string.h>
+#include <stdarg.h>
+#include <stdio.h>
+
+#include "color.h"
+#include "event.h"
+#include "debug.h"
+
+int verbose = 0;
+int dump_trace = 0;
+
+int eprintf(const char *fmt, ...)
+{
+        va_list args;
+        int ret = 0;
+
+        if (verbose) {
+                va_start(args, fmt);
+                ret = vfprintf(stderr, fmt, args);
+                va_end(args);
+        }
+
+        return ret;
+}
+
+int dump_printf(const char *fmt, ...)
+{
+        va_list args;
+        int ret = 0;
+
+        if (dump_trace) {
+                va_start(args, fmt);
+                ret = vprintf(fmt, args);
+                va_end(args);
+        }
+
+        return ret;
+}
+
+static int dump_printf_color(const char *fmt, const char *color, ...)
+{
+        va_list args;
+        int ret = 0;
+
+        if (dump_trace) {
+                va_start(args, color);
+                ret = color_vfprintf(stdout, color, fmt, args);
+                va_end(args);
+        }
+
+        return ret;
+}
+
+
+void trace_event(event_t *event)
+{
+        unsigned char *raw_event = (void *)event;
+        const char *color = PERF_COLOR_BLUE;
+        int i, j;
+
+        if (!dump_trace)
+                return;
+
+        dump_printf(".");
+        dump_printf_color("\n. ... raw event: size %d bytes\n", color,
+                          event->header.size);
+
+        for (i = 0; i < event->header.size; i++) {
+                if ((i & 15) == 0) {
+                        dump_printf(".");
+                        dump_printf_color("  %04x: ", color, i);
+                }
+
+                dump_printf_color(" %02x", color, raw_event[i]);
+
+                if (((i & 15) == 15) || i == event->header.size-1) {
+                        dump_printf_color("  ", color);
+                        for (j = 0; j < 15-(i & 15); j++)
+                                dump_printf_color("   ", color);
+                        for (j = 0; j < (i & 15); j++) {
+                                if (isprint(raw_event[i-15+j]))
+                                        dump_printf_color("%c", color,
+                                                          raw_event[i-15+j]);
+                                else
+                                        dump_printf_color(".", color);
+                        }
+                        dump_printf_color("\n", color);
+                }
+        }
+        dump_printf(".\n");
+}