|
@@ -10,36 +10,47 @@
|
|
#include "debug.h"
|
|
#include "debug.h"
|
|
|
|
|
|
|
|
|
|
-void perf_target__validate(struct perf_target *target)
|
|
|
|
|
|
+enum perf_target_errno perf_target__validate(struct perf_target *target)
|
|
{
|
|
{
|
|
|
|
+ enum perf_target_errno ret = PERF_ERRNO_TARGET__SUCCESS;
|
|
|
|
+
|
|
if (target->pid)
|
|
if (target->pid)
|
|
target->tid = target->pid;
|
|
target->tid = target->pid;
|
|
|
|
|
|
/* CPU and PID are mutually exclusive */
|
|
/* CPU and PID are mutually exclusive */
|
|
if (target->tid && target->cpu_list) {
|
|
if (target->tid && target->cpu_list) {
|
|
- ui__warning("WARNING: PID switch overriding CPU\n");
|
|
|
|
- sleep(1);
|
|
|
|
target->cpu_list = NULL;
|
|
target->cpu_list = NULL;
|
|
|
|
+ if (ret == PERF_ERRNO_TARGET__SUCCESS)
|
|
|
|
+ ret = PERF_ERRNO_TARGET__PID_OVERRIDE_CPU;
|
|
}
|
|
}
|
|
|
|
|
|
/* UID and PID are mutually exclusive */
|
|
/* UID and PID are mutually exclusive */
|
|
if (target->tid && target->uid_str) {
|
|
if (target->tid && target->uid_str) {
|
|
- ui__warning("PID/TID switch overriding UID\n");
|
|
|
|
- sleep(1);
|
|
|
|
target->uid_str = NULL;
|
|
target->uid_str = NULL;
|
|
|
|
+ if (ret == PERF_ERRNO_TARGET__SUCCESS)
|
|
|
|
+ ret = PERF_ERRNO_TARGET__PID_OVERRIDE_UID;
|
|
}
|
|
}
|
|
|
|
|
|
/* UID and CPU are mutually exclusive */
|
|
/* UID and CPU are mutually exclusive */
|
|
if (target->uid_str && target->cpu_list) {
|
|
if (target->uid_str && target->cpu_list) {
|
|
- ui__warning("UID switch overriding CPU\n");
|
|
|
|
- sleep(1);
|
|
|
|
target->cpu_list = NULL;
|
|
target->cpu_list = NULL;
|
|
|
|
+ if (ret == PERF_ERRNO_TARGET__SUCCESS)
|
|
|
|
+ ret = PERF_ERRNO_TARGET__UID_OVERRIDE_CPU;
|
|
}
|
|
}
|
|
|
|
|
|
- /* 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);
|
|
|
|
|
|
+ /* PID and SYSTEM are mutually exclusive */
|
|
|
|
+ if (target->tid && target->system_wide) {
|
|
target->system_wide = false;
|
|
target->system_wide = false;
|
|
|
|
+ if (ret == PERF_ERRNO_TARGET__SUCCESS)
|
|
|
|
+ ret = PERF_ERRNO_TARGET__PID_OVERRIDE_SYSTEM;
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ /* UID and SYSTEM are mutually exclusive */
|
|
|
|
+ if (target->uid_str && target->system_wide) {
|
|
|
|
+ target->system_wide = false;
|
|
|
|
+ if (ret == PERF_ERRNO_TARGET__SUCCESS)
|
|
|
|
+ ret = PERF_ERRNO_TARGET__UID_OVERRIDE_SYSTEM;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ return ret;
|
|
}
|
|
}
|