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 acbe59444385d402d2f2d73840e20282b785fa6a..79f99dba5be0ce493d37c48a0fb765aca6b355b3 100644 (file)
--- a/tools/perf/builtin-record.c
+++ b/tools/perf/builtin-record.c
@@ -48,6 +48,7 @@ static int                    call_graph                      = 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;
@@ -403,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;
@@ -482,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);
 }
 
@@ -549,11 +556,11 @@ static int __cmd_record(int argc, const char **argv)
 
 
        if (raw_samples) {
-               read_tracing_data();
+               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();
+                               read_tracing_data(attrs, nr_counters);
                                break;
                        }
                }
@@ -678,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()
 };