perf tools: Add an option to multiplex counters in a single channel

[deliverable/linux.git] / tools / perf / builtin-record.c

diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c
index 89a5ddcd1ded753e6835c39935989d4c96ac2fdd..79f99dba5be0ce493d37c48a0fb765aca6b355b3 100644 (file)
--- a/tools/perf/builtin-record.c
+++ b/tools/perf/builtin-record.c
@@ -15,6 +15,9 @@
 #include "util/string.h"
 
 #include "util/header.h"
+#include "util/event.h"
+#include "util/debug.h"
+#include "util/trace-event.h"
 
 #include <unistd.h>
 #include <sched.h>
@@ -42,10 +45,10 @@ static int                  inherit                         = 1;
 static int                     force                           = 0;
 static int                     append_file                     = 0;
 static int                     call_graph                      = 0;
-static int                     verbose                         = 0;
 static int                     inherit_stat                    = 0;
 static int                     no_samples                      = 0;
 static int                     sample_address                  = 0;
+static int                     multiplex                       = 0;
 
 static long                    samples;
 static struct timeval          last_read;
@@ -62,24 +65,6 @@ static int                   file_new = 1;
 
 struct perf_header             *header;
 
-struct mmap_event {
-       struct perf_event_header        header;
-       u32                             pid;
-       u32                             tid;
-       u64                             start;
-       u64                             len;
-       u64                             pgoff;
-       char                            filename[PATH_MAX];
-};
-
-struct comm_event {
-       struct perf_event_header        header;
-       u32                             pid;
-       u32                             tid;
-       char                            comm[16];
-};
-
-
 struct mmap_data {
        int                     counter;
        void                    *base;
@@ -419,8 +404,11 @@ static void create_counter(int counter, int cpu, pid_t pid)
        if (call_graph)
                attr->sample_type       |= PERF_SAMPLE_CALLCHAIN;
 
-       if (raw_samples)
+       if (raw_samples) {
+               attr->sample_type       |= PERF_SAMPLE_TIME;
                attr->sample_type       |= PERF_SAMPLE_RAW;
+               attr->sample_type       |= PERF_SAMPLE_CPU;
+       }
 
        attr->mmap              = track;
        attr->comm              = track;
@@ -498,6 +486,9 @@ try_again:
                exit(-1);
        }
 
+       if (multiplex && fd[nr_cpu][counter] != group_fd)
+               ioctl(fd[nr_cpu][counter], PERF_COUNTER_IOC_SET_OUTPUT, group_fd);
+
        ioctl(fd[nr_cpu][counter], PERF_COUNTER_IOC_ENABLE);
 }
 
@@ -563,6 +554,17 @@ static int __cmd_record(int argc, const char **argv)
        else
                header = perf_header__new();
 
+
+       if (raw_samples) {
+               read_tracing_data(attrs, nr_counters);
+       } else {
+               for (i = 0; i < nr_counters; i++) {
+                       if (attrs[i].sample_type & PERF_SAMPLE_RAW) {
+                               read_tracing_data(attrs, nr_counters);
+                               break;
+                       }
+               }
+       }
        atexit(atexit_header);
 
        if (!system_wide) {
@@ -683,6 +685,8 @@ static const struct option options[] = {
                    "Sample addresses"),
        OPT_BOOLEAN('n', "no-samples", &no_samples,
                    "don't sample"),
+       OPT_BOOLEAN('M', "multiplex", &multiplex,
+                   "multiplex counter output in a single channel"),
        OPT_END()
 };