perf tools: Introduce perf_target__validate() helper

The perf_target__validate function is used to check given PID/TID/UID/CPU
target options and warn if some combination is impossible. Also this can
make some arguments of parse_target_uid() function useless as it is checked
before the call via our new helper.

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-5-git-send-email-namhyung.kim@lge.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

1 files changed, 21 insertions, 8 deletions

diff --git a/tools/perf/util/usage.c b/tools/perf/util/usage.c
index 52bb07c6442a..0a1a885a5914 100644
--- a/tools/perf/util/usage.c
+++ b/tools/perf/util/usage.c
@@ -83,7 +83,7 @@ void warning(const char *warn, ...)
         va_end(params);
 }
 
-uid_t parse_target_uid(const char *str, const char *tid, const char *pid)
+uid_t parse_target_uid(const char *str)
 {
         struct passwd pwd, *result;
         char buf[1024];
@@ -91,13 +91,6 @@ uid_t parse_target_uid(const char *str, const char *tid, const char *pid)
         if (str == NULL)
                 return UINT_MAX;
 
-        /* UID and PID are mutually exclusive */
-        if (tid || pid) {
-                ui__warning("PID/TID switch overriding UID\n");
-                sleep(1);
-                return UINT_MAX;
-        }
-
         getpwnam_r(str, &pwd, buf, sizeof(buf), &result);
 
         if (result == NULL) {
@@ -120,3 +113,23 @@ uid_t parse_target_uid(const char *str, const char *tid, const char *pid)
 
         return result->pw_uid;
 }
+
+void perf_target__validate(struct perf_target *target)
+{
+        if (target->pid)
+                target->tid = target->pid;
+
+        /* CPU and PID are mutually exclusive */
+        if (target->tid && target->cpu_list) {
+                ui__warning("WARNING: PID switch overriding CPU\n");
+                sleep(1);
+                target->cpu_list = NULL;
+        }
+
+        /* UID and PID are mutually exclusive */
+        if (target->tid && target->uid_str) {
+                ui__warning("PID/TID switch overriding UID\n");
+                sleep(1);
+                target->uid_str = NULL;
+        }
+}