Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a524b118 authored by Greg Hackmann's avatar Greg Hackmann Committed by John Stultz
Browse files

kselftests: timers: set-timer-lat: Tweak reporting when timer fires early 



Rather than printing an error inside the alarm signal handler, set a
flag that we check later.  This keeps the test from spamming the console
every time the alarm fires early.  It also fixes the test exiting with
error code 0 if this was the only test failure.

Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Miroslav Lichvar <mlichvar@redhat.com>
Cc: Richard Cochran <richardcochran@gmail.com>
Cc: Prarit Bhargava <prarit@redhat.com>
Cc: Stephen Boyd <stephen.boyd@linaro.org>
Cc: Shuah Khan <shuah@kernel.org>
Cc: linux-kselftest@vger.kernel.org
Signed-off-by: default avatarGreg Hackmann <ghackmann@google.com>
Signed-off-by: default avatarJohn Stultz <john.stultz@linaro.org>
parent 6cc63661

tools/testing/selftests/timers/set-timer-lat.c

+25 −8
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ int alarmcount; 
int clock_id;

struct timespec start_time;

long long max_latency_ns;

int timer_fired_early;



char *clockstring(int clockid)

{
@@ -115,12 +116,19 @@ void sigalarm(int signo) 
	delta_ns -= NSEC_PER_SEC * TIMER_SECS * alarmcount;



	if (delta_ns < 0)

		printf("%s timer fired early: FAIL\n", clockstring(clock_id));

		timer_fired_early = 1;



	if (delta_ns > max_latency_ns)

		max_latency_ns = delta_ns;

}



void describe_timer(int flags)

{

	printf("%-22s %s ",

			clockstring(clock_id),

			flags ? "ABSTIME":"RELTIME");

}



int do_timer(int clock_id, int flags)

{

	struct sigevent se;
@@ -136,6 +144,7 @@ int do_timer(int clock_id, int flags) 


	max_latency_ns = 0;

	alarmcount = 0;

	timer_fired_early = 0;



	err = timer_create(clock_id, &se, &tm1);

	if (err) {
@@ -170,18 +179,26 @@ int do_timer(int clock_id, int flags) 
	while (alarmcount < 5)

		sleep(1);



	printf("%-22s %s max latency: %10lld ns : ",

			clockstring(clock_id),

			flags ? "ABSTIME":"RELTIME",

			max_latency_ns);

	describe_timer(flags);

	printf("timer fired early: %7d : ", timer_fired_early);

	if (!timer_fired_early) {

		printf("[OK]\n");

	} else {

		printf("[FAILED]\n");

		err = -1;

	}



	describe_timer(flags);

	printf("max latency: %10lld ns : ", max_latency_ns);



	timer_delete(tm1);

	if (max_latency_ns < UNRESONABLE_LATENCY) {

		printf("[OK]\n");

		return 0;

	}

	} else {

		printf("[FAILED]\n");

	return -1;

		err = -1;

	}

	return err;

}



int main(void)