Skip to content

Commit eefd95e

Browse files
author
Shuah Khan
committed
selftests: timers: set-timer-lat: Fix hang when testing unsupported alarms
When timer_create() fails on a bootime or realtime clock, setup_timer() returns 0 as if timer has been set. Callers wait forever for the timer to expire. This hang is seen on a system that doesn't have support for: CLOCK_REALTIME_ALARM ABSTIME missing CAP_WAKE_ALARM? : [UNSUPPORTED] Test hangs waiting for a timer that hasn't been set to expire. Fix setup_timer() to return 1, add handling in callers to detect the unsupported case and return 0 without waiting to not fail the test. Signed-off-by: Shuah Khan <[email protected]>
1 parent 01db7fb commit eefd95e

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,8 @@ int setup_timer(int clock_id, int flags, int interval, timer_t *tm1)
143143
printf("%-22s %s missing CAP_WAKE_ALARM? : [UNSUPPORTED]\n",
144144
clockstring(clock_id),
145145
flags ? "ABSTIME":"RELTIME");
146-
return 0;
146+
/* Indicate timer isn't set, so caller doesn't wait */
147+
return 1;
147148
}
148149
printf("%s - timer_create() failed\n", clockstring(clock_id));
149150
return -1;
@@ -213,8 +214,9 @@ int do_timer(int clock_id, int flags)
213214
int err;
214215

215216
err = setup_timer(clock_id, flags, interval, &tm1);
217+
/* Unsupported case - return 0 to not fail the test */
216218
if (err)
217-
return err;
219+
return err == 1 ? 0 : err;
218220

219221
while (alarmcount < 5)
220222
sleep(1);
@@ -231,8 +233,9 @@ int do_timer_oneshot(int clock_id, int flags)
231233
int err;
232234

233235
err = setup_timer(clock_id, flags, interval, &tm1);
236+
/* Unsupported case - return 0 to not fail the test */
234237
if (err)
235-
return err;
238+
return err == 1 ? 0 : err;
236239

237240
memset(&timeout, 0, sizeof(timeout));
238241
timeout.tv_sec = 5;

0 commit comments

Comments
 (0)