[Devel] [PATCH vz10 v2 3/3] selftests: timers: measure each timer on the clock it is armed with

[Eva Kurchatova]

Commit b00385b8d081 ("selftests/posix_timers: Use CLOCK_THREAD_CPUTIME_ID
for ITIMER_PROF measurements") gave ITIMER_PROF the clock it counts, as
measuring a cpu timer against the wall says nothing on a machine where
the task does not have a cpu to itself.  The other timers are still
measured against CLOCK_REALTIME and fail the same way.  With four busy
loops on the two cpus of a test machine:

  not ok 2 ITIMER_VIRTUAL
  not ok 5 timer_create() per CLOCK_THREAD_CPUTIME_ID
  not ok 6 timer_create() per CLOCK_PROCESS_CPUTIME_ID

ITIMER_VIRTUAL counts the time the task spends in userspace, so take
CLOCK_THREAD_CPUTIME_ID for it as well; the loop it runs stays in
userspace, so what that clock adds for system time is far inside the
half a second the check allows.  check_timer_create() arms its timer on
the clock it is given, so measure on that one.

ITIMER_REAL is armed with CLOCK_MONOTONIC, in fork.c:

  hrtimer_setup(&sig->real_timer, it_real_fn, CLOCK_MONOTONIC,
                HRTIMER_MODE_REL);

so measure it on that rather than on CLOCK_REALTIME, which a step of the
wall clock would carry away from the timer it is timing.  All three arms
now choose a clock, so they read better as a switch, which also gives
the unknown case somewhere to go.

The test passes whole on that machine, 19 of 19, busy or idle.

https://virtuozzo.atlassian.net/browse/VSTOR-143363
Feature: fix selftests
Signed-off-by: Eva Kurchatova <eva.kurchatova at virtuozzo.com>
---
 tools/testing/selftests/timers/posix_timers.c | 21 +++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/tools/testing/selftests/timers/posix_timers.c b/tools/testing/selftests/timers/posix_timers.c
index 077a98fb1b1d..f5a92ede3a6d 100644
--- a/tools/testing/selftests/timers/posix_timers.c
+++ b/tools/testing/selftests/timers/posix_timers.c
@@ -108,18 +108,27 @@ static void check_itimer(int which, const char *name)
 	struct itimerval val = {
 		.it_value.tv_sec = DELAY,
 	};
-	int clock_id = CLOCK_REALTIME;
+	int clock_id;
 
 	done = 0;
 
-	if (which == ITIMER_VIRTUAL)
+	/* Measure each timer on the clock the kernel arms it with. */
+	switch (which) {
+	case ITIMER_VIRTUAL:
+		clock_id = CLOCK_THREAD_CPUTIME_ID;
 		signal(SIGVTALRM, sig_handler);
-	else if (which == ITIMER_PROF) {
+		break;
+	case ITIMER_PROF:
 		clock_id = CLOCK_THREAD_CPUTIME_ID;
 		signal(SIGPROF, sig_handler);
-	}
-	else if (which == ITIMER_REAL)
+		break;
+	case ITIMER_REAL:
+		clock_id = CLOCK_MONOTONIC;
 		signal(SIGALRM, sig_handler);
+		break;
+	default:
+		fatal_error(name, "unknown itimer");
+	}
 
 	if (clock_gettime(clock_id, &start))
 		fatal_error(name, "clock_gettime()");
@@ -146,7 +155,7 @@ static void check_timer_create(int which, const char *name)
 	struct itimerspec val = {
 		.it_value.tv_sec = DELAY,
 	};
-	int clock_id = CLOCK_REALTIME;
+	int clock_id = which;
 	timer_t id;
 
 	done = 0;
-- 
2.55.0