From cbf9967734cedebc4792ba627aed2008fae0fa0a Mon Sep 17 00:00:00 2001 From: Namhyung Kim Date: Thu, 26 Apr 2012 14:15:20 +0900 Subject: [PATCH] --- yaml --- r: 304908 b: refs/heads/master c: 770a34a38b74982724dbb099225944b415f90281 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/tools/perf/util/usage.c | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 6ab2372eb773..866a26333b03 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b809ac100e2f12ebf1b58ff522dba15651a77d27 +refs/heads/master: 770a34a38b74982724dbb099225944b415f90281 diff --git a/trunk/tools/perf/util/usage.c b/trunk/tools/perf/util/usage.c index 0a1a885a5914..228f0a558872 100644 --- a/trunk/tools/perf/util/usage.c +++ b/trunk/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; + } }