In 0c4a5fc95b1df (Add leap-second timer edge testing to
leap-a-day.c), we added a timer to the test which checks to make
sure timers near the leapsecond edge behave correctly.
However, the output generated from the timer uses ctime_r, which
isn't async-signal safe, and should that signal land while the
main test is using ctime_r to print its output, its possible for
the test to deadlock on glibc internal locks.
Thus this patch reworks the output to avoid using ctime_r in
the signal handler.
Cc: Prarit Bhargava <pra...@redhat.com>
Cc: Daniel Bristot de Oliveira <bris...@redhat.com>
Cc: Richard Cochran <richardcoch...@gmail.com>
Cc: Jan Kara <j...@suse.cz>
Cc: Jiri Bohac <jbo...@suse.cz>
Cc: Ingo Molnar <mi...@kernel.org>
Cc: Thomas Gleixner <t...@linutronix.de>
Cc: Shuah Khan <shua...@osg.samsung.com>
Signed-off-by: John Stultz <john.stu...@linaro.org>
---
(This applies to tip/timers/core)
tools/testing/selftests/timers/leap-a-day.c | 23 ++++++++++++-----------
1 file changed, 12 insertions(+), 11 deletions(-)
diff --git a/tools/testing/selftests/timers/leap-a-day.c
b/tools/testing/selftests/timers/leap-a-day.c
index 331c4f7..fb46ad6 100644
--- a/tools/testing/selftests/timers/leap-a-day.c
+++ b/tools/testing/selftests/timers/leap-a-day.c
@@ -141,27 +141,28 @@ void handler(int unused)
void sigalarm(int signo)
{
struct timex tx;
- char buf[26];
int ret;
tx.modes = 0;
ret = adjtimex(&tx);
- ctime_r(&tx.time.tv_sec, buf);
- buf[strlen(buf)-1] = 0; /*remove trailing\n */
- printf("%s + %6ld us (%i)\t%s - TIMER FIRED\n",
- buf,
+ if (tx.time.tv_sec < next_leap) {
+ printf("Error: Early timer expiration! (Should be %ld)\n",
next_leap);
+ error_found = 1;
+ printf("adjtimex: %10ld sec + %6ld us (%i)\t%s\n",
+ tx.time.tv_sec,
tx.time.tv_usec,
tx.tai,
time_state_str(ret));
-
- if (tx.time.tv_sec < next_leap) {
- printf("Error: Early timer expiration!\n");
- error_found = 1;
}
if (ret != TIME_WAIT) {
- printf("Error: Incorrect NTP state?\n");
+ printf("Error: Timer seeing incorrect NTP state? (Should be
TIME_WAIT)\n");
error_found = 1;
+ printf("adjtimex: %10ld sec + %6ld us (%i)\t%s\n",
+ tx.time.tv_sec,
+ tx.time.tv_usec,
+ tx.tai,
+ time_state_str(ret));
}
}
@@ -297,7 +298,7 @@ int main(int argc, char **argv)
printf("Scheduling leap second for %s", ctime(&next_leap));
/* Set up timer */
- printf("Setting timer for %s", ctime(&next_leap));
+ printf("Setting timer for %ld - %s", next_leap,
ctime(&next_leap));
memset(&se, 0, sizeof(se));
se.sigev_notify = SIGEV_SIGNAL;
se.sigev_signo = signum;
--
1.9.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
