From 1c82b97f9624f04f780e2e7f5408d748f07a364d Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sat, 15 Feb 2003 22:32:50 +0000 Subject: Update. * tst-mutex5.c (do_test): Add more timedlock tests. --- nptl/tst-mutex5.c | 44 +++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 41 insertions(+), 3 deletions(-) (limited to 'nptl/tst-mutex5.c') diff --git a/nptl/tst-mutex5.c b/nptl/tst-mutex5.c index cfa8d31568..2ade6a7f83 100644 --- a/nptl/tst-mutex5.c +++ b/nptl/tst-mutex5.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2002 Free Software Foundation, Inc. +/* Copyright (C) 2002, 2003 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 2002. @@ -60,12 +60,12 @@ do_test (void) err = pthread_mutex_timedlock (&m, &ts); if (err == 0) { - puts ("timed_lock succeeded"); + puts ("timedlock succeeded"); return 1; } else if (err != ETIMEDOUT) { - printf ("timed_lock error != ETIMEDOUT: %d\n", err); + printf ("timedlock error != ETIMEDOUT: %d\n", err); return 1; } else @@ -98,12 +98,50 @@ do_test (void) } } + (void) gettimeofday (&tv, NULL); + TIMEVAL_TO_TIMESPEC (&tv, &ts); + + ts.tv_sec += 2; /* Wait 2 seconds. */ + /* The following makes the ts value invalid. */ + ts.tv_nsec += 1000000000; + + err = pthread_mutex_timedlock (&m, &ts); + if (err == 0) + { + puts ("2nd timedlock succeeded"); + return 1; + } + else if (err != EINVAL) + { + printf ("2nd timedlock error != EINVAL: %d\n", err); + return 1; + } + if (pthread_mutex_unlock (&m) != 0) { puts ("mutex_unlock failed"); return 1; } + (void) gettimeofday (&tv, NULL); + TIMEVAL_TO_TIMESPEC (&tv, &ts); + + ts.tv_sec += 2; /* Wait 2 seconds. */ + if (pthread_mutex_timedlock (&m, &ts) != 0) + { + puts ("3rd timedlock failed"); + } + + (void) gettimeofday (&tv2, NULL); + + /* Check that timedlock didn't delay. We use a limit of 0.1 secs. */ + timersub (&tv2, &tv, &tv2); + if (tv2.tv_sec > 0 || tv2.tv_usec > 100000) + { + puts ("3rd timedlock didn't return right away"); + exit (1); + } + if (pthread_mutex_destroy (&m) != 0) { puts ("mutex_destroy failed"); -- cgit v1.2.3