summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-05-31 19:36:50 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2023-05-31 19:36:50 +0000
commit886dfe2c36e1b45f070aadf81bd81ef8399e8499 (patch)
tree6c317fe54e9ccf11d0c8ffc5d5ebfec5781f7be7
parent8aff5ada381ed5d2e9b9cc6d4b6b34e9e252e4ca (diff)
parentde547274b77b68fcf96c95482454d87966a9d5f7 (diff)
downloadextras-886dfe2c36e1b45f070aadf81bd81ef8399e8499.tar.gz
Merge "Merge "arc: Fix CTS tests for grunt" into android11-tests-dev am: b19afd3d01" into android12-tests-dev
-rw-r--r--simpleperf/environment.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/simpleperf/environment.cpp b/simpleperf/environment.cpp
index 4c960350..35790370 100644
--- a/simpleperf/environment.cpp
+++ b/simpleperf/environment.cpp
@@ -331,9 +331,10 @@ bool SetPerfEventLimits(uint64_t sample_freq, size_t cpu_percent, uint64_t mlock
}
// Wait for init process to change perf event limits based on properties.
const size_t max_wait_us = 3 * 1000000;
+ const size_t interval_us = 10000;
int finish_mask = 0;
- for (size_t i = 0; i < max_wait_us && finish_mask != 7; ++i) {
- usleep(1); // Wait 1us to avoid busy loop.
+ for (size_t i = 0; i < max_wait_us && finish_mask != 7; i += interval_us) {
+ usleep(interval_us); // Wait 10ms to avoid busy loop.
if ((finish_mask & 1) == 0) {
uint64_t freq;
if (!GetMaxSampleFrequency(&freq) || freq == sample_freq) {