Merge "perf_event_open02: set process as RT during Setup stage" into main am: a7a24f319b Original change: https://android-review.googlesource.com/c/platform/external/ltp/+/3342199 Change-Id: Iefb81c87787bbf9fbe1cffcb1cdddf32f52b3454 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/testcases/kernel/syscalls/perf_event_open/perf_event_open02.c b/testcases/kernel/syscalls/perf_event_open/perf_event_open02.c index bf6291d..27cc83c 100644 --- a/testcases/kernel/syscalls/perf_event_open/perf_event_open02.c +++ b/testcases/kernel/syscalls/perf_event_open/perf_event_open02.c
@@ -198,6 +198,12 @@ { int i; struct perf_event_attr tsk_event, hw_event; + struct sched_param sparam = {.sched_priority = 1}; + + if (sched_setscheduler(0, SCHED_FIFO, &sparam)) { + tst_brk(TBROK | TERRNO, + "sched_setscheduler(0, SCHED_FIFO, ...) failed"); + } for (i = 0; i < MAX_CTRS; i++) { hwfd[i] = -1; @@ -271,12 +277,7 @@ unsigned long long vtsum = 0, vhsum = 0; int i; double ratio; - struct sched_param sparam = {.sched_priority = 1}; - - if (sched_setscheduler(0, SCHED_FIFO, &sparam)) { - tst_brk(TBROK | TERRNO, - "sched_setscheduler(0, SCHED_FIFO, ...) failed"); - } + struct sched_param sparam = {.sched_priority = 0}; all_counters_set(PR_TASK_PERF_EVENTS_ENABLE); do_work(8);