diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-01-21 13:09:24 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-01-21 13:09:24 +0000 |
| commit | db7b37283dcd2da864475eebe9c344d4ca59dae8 (patch) | |
| tree | 416c0654b652509ffc70e3b7ab0b238c3e0ead3c | |
| parent | 3245ca8fcb5fe55998174d450c25d35f3192a27d (diff) | |
| parent | 32a0593f031e6da63db417699d621d9bb1295056 (diff) | |
| download | ltp-android13-mainline-media-release.tar.gz | |
Snap for 9515135 from 32a0593f031e6da63db417699d621d9bb1295056 to mainline-media-releaseaml_med_331712010aml_med_331612000android13-mainline-media-release
Change-Id: I93a003ac38dca2febbb4066209716efe5d2764c6
| -rwxr-xr-x | testcases/kernel/controllers/cgroup_fj/cgroup_fj_function.sh | 1 | ||||
| -rw-r--r-- | testcases/kernel/syscalls/clock_gettime/clock_gettime04.c | 18 |
2 files changed, 17 insertions, 2 deletions
diff --git a/testcases/kernel/controllers/cgroup_fj/cgroup_fj_function.sh b/testcases/kernel/controllers/cgroup_fj/cgroup_fj_function.sh index fc3ad1b63..8c282f287 100755 --- a/testcases/kernel/controllers/cgroup_fj/cgroup_fj_function.sh +++ b/testcases/kernel/controllers/cgroup_fj/cgroup_fj_function.sh @@ -168,6 +168,7 @@ test8() # Test that notify_on_release can be changed test9() { + create_subgroup "$start_path/ltp_1" local notify=$(ROD cat "$start_path/ltp_1/notify_on_release") local value diff --git a/testcases/kernel/syscalls/clock_gettime/clock_gettime04.c b/testcases/kernel/syscalls/clock_gettime/clock_gettime04.c index a8d2c5b38..c279da79e 100644 --- a/testcases/kernel/syscalls/clock_gettime/clock_gettime04.c +++ b/testcases/kernel/syscalls/clock_gettime/clock_gettime04.c @@ -35,7 +35,7 @@ clockid_t clks[] = { }; static gettime_t ptr_vdso_gettime, ptr_vdso_gettime64; -static long long delta = 5; +static long long delta, precise_delta, coarse_delta; static inline int do_vdso_gettime(gettime_t vdso, clockid_t clk_id, void *ts) { @@ -92,9 +92,18 @@ static struct time64_variants variants[] = { static void setup(void) { + struct timespec res; + + clock_getres(CLOCK_REALTIME, &res); + precise_delta = 5 + res.tv_nsec / 1000000; + + clock_getres(CLOCK_REALTIME_COARSE, &res); + coarse_delta = 5 + res.tv_nsec / 1000000; + if (tst_is_virt(VIRT_ANY)) { tst_res(TINFO, "Running in a virtual machine, multiply the delta by 10."); - delta *= 10; + precise_delta *= 10; + coarse_delta *= 10; } find_clock_gettime_vdso(&ptr_vdso_gettime, &ptr_vdso_gettime64); @@ -108,6 +117,11 @@ static void run(unsigned int i) int count = 10000, ret; unsigned int j; + if (clks[i] == CLOCK_REALTIME_COARSE || clks[i] == CLOCK_MONOTONIC_COARSE) + delta = coarse_delta; + else + delta = precise_delta; + do { for (j = 0; j < ARRAY_SIZE(variants); j++) { /* Refresh time in start */ |