perf tests: Add 'keep tracking' test

Add a test for the newly added PERF_COUNT_SW_DUMMY event.  The test
checks that tracking events continue when an event is disabled but a
dummy software event is not disabled.

Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Acked-by: Jiri Olsa <jolsa@redhat.com>
Tested-by: Jiri Olsa <jolsa@redhat.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/r/1377975053-3811-4-git-send-email-adrian.hunter@intel.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

2 files changed, 45 insertions, 2 deletions

diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c
index 5df4ca91bed3..b8727ae45e3b 100644
--- a/tools/perf/util/evlist.c
+++ b/tools/perf/util/evlist.c
@@ -246,7 +246,7 @@ void perf_evlist__disable(struct perf_evlist *evlist)
 
         for (cpu = 0; cpu < nr_cpus; cpu++) {
                 list_for_each_entry(pos, &evlist->entries, node) {
-                        if (!perf_evsel__is_group_leader(pos))
+                        if (!perf_evsel__is_group_leader(pos) || !pos->fd)
                                 continue;
                         for (thread = 0; thread < nr_threads; thread++)
                                 ioctl(FD(pos, cpu, thread),
@@ -264,7 +264,7 @@ void perf_evlist__enable(struct perf_evlist *evlist)
 
         for (cpu = 0; cpu < nr_cpus; cpu++) {
                 list_for_each_entry(pos, &evlist->entries, node) {
-                        if (!perf_evsel__is_group_leader(pos))
+                        if (!perf_evsel__is_group_leader(pos) || !pos->fd)
                                 continue;
                         for (thread = 0; thread < nr_threads; thread++)
                                 ioctl(FD(pos, cpu, thread),
@@ -273,6 +273,44 @@ void perf_evlist__enable(struct perf_evlist *evlist)
         }
 }
 
+int perf_evlist__disable_event(struct perf_evlist *evlist,
+                               struct perf_evsel *evsel)
+{
+        int cpu, thread, err;
+
+        if (!evsel->fd)
+                return 0;
+
+        for (cpu = 0; cpu < evlist->cpus->nr; cpu++) {
+                for (thread = 0; thread < evlist->threads->nr; thread++) {
+                        err = ioctl(FD(evsel, cpu, thread),
+                                    PERF_EVENT_IOC_DISABLE, 0);
+                        if (err)
+                                return err;
+                }
+        }
+        return 0;
+}
+
+int perf_evlist__enable_event(struct perf_evlist *evlist,
+                              struct perf_evsel *evsel)
+{
+        int cpu, thread, err;
+
+        if (!evsel->fd)
+                return -EINVAL;
+
+        for (cpu = 0; cpu < evlist->cpus->nr; cpu++) {
+                for (thread = 0; thread < evlist->threads->nr; thread++) {
+                        err = ioctl(FD(evsel, cpu, thread),
+                                    PERF_EVENT_IOC_ENABLE, 0);
+                        if (err)
+                                return err;
+                }
+        }
+        return 0;
+}
+
 static int perf_evlist__alloc_pollfd(struct perf_evlist *evlist)
 {
         int nr_cpus = cpu_map__nr(evlist->cpus);
diff --git a/tools/perf/util/evlist.h b/tools/perf/util/evlist.h
index 841a39405f6a..880d7139d2fb 100644
--- a/tools/perf/util/evlist.h
+++ b/tools/perf/util/evlist.h
@@ -110,6 +110,11 @@ void perf_evlist__munmap(struct perf_evlist *evlist);
 void perf_evlist__disable(struct perf_evlist *evlist);
 void perf_evlist__enable(struct perf_evlist *evlist);
 
+int perf_evlist__disable_event(struct perf_evlist *evlist,
+                               struct perf_evsel *evsel);
+int perf_evlist__enable_event(struct perf_evlist *evlist,
+                              struct perf_evsel *evsel);
+
 void perf_evlist__set_selected(struct perf_evlist *evlist,
                                struct perf_evsel *evsel);