perf tools: Check more combinations of PID/TID, UID and CPU switches

There were some combinations of these switches that are not so
appropriate IMHO.

Since there are implicit priorities between them and they worked well
anyway, but it ends up opening useless duplicated events.

For example, 'perf stat -t <pid> -a' will open multiple events for the
thread instead of one.

Add explicit checks and warn user in perf_target__validate().

Signed-off-by: Namhyung Kim <namhyung.kim@lge.com>
Reviewed-by: David Ahern <dsahern@gmail.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1335417327-11796-7-git-send-email-namhyung.kim@lge.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/util/usage.c b/tools/perf/util/usage.c
index 0a1a885a5914eb6cd6a0b3de6e8a7ec0115791d3..228f0a558872a4e7a671909be8511c3d6420d80b 100644 (file)
--- a/tools/perf/util/usage.c
+++ b/tools/perf/util/usage.c
@@ -132,4 +132,18 @@ void perf_target__validate(struct perf_target *target)
                sleep(1);
                target->uid_str = NULL;
        }
+
+       /* UID and CPU are mutually exclusive */
+       if (target->uid_str && target->cpu_list) {
+               ui__warning("UID switch overriding CPU\n");
+               sleep(1);
+               target->cpu_list = NULL;
+       }
+
+       /* PID/UID and SYSTEM are mutually exclusive */
+       if ((target->tid || target->uid_str) && target->system_wide) {
+               ui__warning("PID/TID/UID switch overriding CPU\n");
+               sleep(1);
+               target->system_wide = false;
+       }
 }