-/* Copyright (C) 2002-2017 Free Software Foundation, Inc.
+/* Copyright (C) 2002-2019 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
You should have received a copy of the GNU Lesser General Public
License along with the GNU C Library; if not, see
- <http://www.gnu.org/licenses/>. */
+ <https://www.gnu.org/licenses/>. */
#include <errno.h>
#include <pthread.h>
#include <stdio.h>
#include <string.h>
#include <sys/time.h>
+#include <support/check.h>
+#include <support/timespec.h>
+#include <support/xthread.h>
+#include <support/xtime.h>
+/* A bogus clock value that tells run_test to use pthread_rwlock_timedrdlock
+ and pthread_rwlock_timedwrlock rather than pthread_rwlock_clockrdlock and
+ pthread_rwlock_clockwrlock. */
+#define CLOCK_USE_TIMEDLOCK (-1)
+
static int kind[] =
{
PTHREAD_RWLOCK_PREFER_READER_NP,
PTHREAD_RWLOCK_PREFER_WRITER_NP,
};
+struct thread_args
+{
+ pthread_rwlock_t *rwlock;
+ clockid_t clockid;
+ const char *fnname;
+};
static void *
tf (void *arg)
{
- pthread_rwlock_t *r = arg;
+ struct thread_args *args = arg;
+ pthread_rwlock_t *r = args->rwlock;
+ const clockid_t clockid = args->clockid;
+ const clockid_t clockid_for_get =
+ (clockid == CLOCK_USE_TIMEDLOCK) ? CLOCK_REALTIME : clockid;
+ const char *fnname = args->fnname;
/* Timeout: 0.3 secs. */
- struct timeval tv;
- (void) gettimeofday (&tv, NULL);
-
- struct timespec ts;
- TIMEVAL_TO_TIMESPEC (&tv, &ts);
- ts.tv_nsec += 300000000;
- if (ts.tv_nsec >= 1000000000)
- {
- ts.tv_nsec -= 1000000000;
- ++ts.tv_sec;
- }
-
- int err = pthread_rwlock_timedwrlock (r, &ts);
- if (err == 0)
- {
- puts ("rwlock_timedwrlock returned");
- pthread_exit ((void *) 1l);
- }
-
- if (err != ETIMEDOUT)
- {
- printf ("err = %s (%d), expected %s (%d)\n",
- strerror (err), err, strerror (ETIMEDOUT), ETIMEDOUT);
- pthread_exit ((void *) 1l);
- }
- puts ("child: timedwrlock failed with ETIMEDOUT");
-
- struct timeval tv2;
- (void) gettimeofday (&tv2, NULL);
-
- timersub (&tv2, &tv, &tv);
-
- if (tv.tv_usec < 200000)
- {
- puts ("timeout too short");
- pthread_exit ((void *) 1l);
- }
-
- (void) gettimeofday (&tv, NULL);
- TIMEVAL_TO_TIMESPEC (&tv, &ts);
- ts.tv_sec += 10;
+ struct timespec ts_start;
+ xclock_gettime (clockid_for_get, &ts_start);
+ const struct timespec ts_timeout = timespec_add (ts_start,
+ make_timespec (0, 300000000));
+
+ if (clockid == CLOCK_USE_TIMEDLOCK)
+ TEST_COMPARE (pthread_rwlock_timedwrlock (r, &ts_timeout), ETIMEDOUT);
+ else
+ TEST_COMPARE (pthread_rwlock_clockwrlock (r, clockid, &ts_timeout),
+ ETIMEDOUT);
+ printf ("child: %swrlock failed with ETIMEDOUT", fnname);
+
+ TEST_TIMESPEC_NOW_OR_AFTER (clockid_for_get, ts_timeout);
+
+ struct timespec ts_invalid;
+ xclock_gettime (clockid_for_get, &ts_invalid);
+ ts_invalid.tv_sec += 10;
/* Note that the following operation makes ts invalid. */
- ts.tv_nsec += 1000000000;
+ ts_invalid.tv_nsec += 1000000000;
- err = pthread_rwlock_timedwrlock (r, &ts);
- if (err == 0)
- {
- puts ("2nd timedwrlock succeeded");
- pthread_exit ((void *) 1l);
- }
- if (err != EINVAL)
- {
- puts ("2nd timedwrlock did not return EINVAL");
- pthread_exit ((void *) 1l);
- }
- puts ("child: timedwrlock failed with EINVAL");
+ if (clockid == CLOCK_USE_TIMEDLOCK)
+ TEST_COMPARE (pthread_rwlock_timedwrlock (r, &ts_invalid), EINVAL);
+ else
+ TEST_COMPARE (pthread_rwlock_clockwrlock (r, clockid, &ts_invalid), EINVAL);
+
+ printf ("child: %swrlock failed with EINVAL", fnname);
return NULL;
}
static int
-do_test (void)
+do_test_clock (clockid_t clockid, const char *fnname)
{
+ const clockid_t clockid_for_get =
+ (clockid == CLOCK_USE_TIMEDLOCK) ? CLOCK_REALTIME : clockid;
size_t cnt;
for (cnt = 0; cnt < sizeof (kind) / sizeof (kind[0]); ++cnt)
{
pthread_rwlockattr_t a;
if (pthread_rwlockattr_init (&a) != 0)
- {
- printf ("round %Zu: rwlockattr_t failed\n", cnt);
- exit (1);
- }
+ FAIL_EXIT1 ("round %Zu: rwlockattr_t failed\n", cnt);
if (pthread_rwlockattr_setkind_np (&a, kind[cnt]) != 0)
- {
- printf ("round %Zu: rwlockattr_setkind failed\n", cnt);
- exit (1);
- }
+ FAIL_EXIT1 ("round %Zu: rwlockattr_setkind failed\n", cnt);
if (pthread_rwlock_init (&r, &a) != 0)
- {
- printf ("round %Zu: rwlock_init failed\n", cnt);
- exit (1);
- }
+ FAIL_EXIT1 ("round %Zu: rwlock_init failed\n", cnt);
if (pthread_rwlockattr_destroy (&a) != 0)
- {
- printf ("round %Zu: rwlockattr_destroy failed\n", cnt);
- exit (1);
- }
-
- struct timeval tv;
- (void) gettimeofday (&tv, NULL);
+ FAIL_EXIT1 ("round %Zu: rwlockattr_destroy failed\n", cnt);
struct timespec ts;
- TIMEVAL_TO_TIMESPEC (&tv, &ts);
+ xclock_gettime (clockid_for_get, &ts);
++ts.tv_sec;
/* Get a read lock. */
- if (pthread_rwlock_timedrdlock (&r, &ts) != 0)
- {
- printf ("round %Zu: rwlock_timedrdlock failed\n", cnt);
- exit (1);
- }
- printf ("%zu: got timedrdlock\n", cnt);
-
- pthread_t th;
- if (pthread_create (&th, NULL, tf, &r) != 0)
- {
- printf ("round %Zu: create failed\n", cnt);
- exit (1);
- }
-
- void *status;
- if (pthread_join (th, &status) != 0)
- {
- printf ("round %Zu: join failed\n", cnt);
- exit (1);
- }
+ if (clockid == CLOCK_USE_TIMEDLOCK) {
+ if (pthread_rwlock_timedrdlock (&r, &ts) != 0)
+ FAIL_EXIT1 ("round %Zu: rwlock_timedrdlock failed\n", cnt);
+ } else {
+ if (pthread_rwlock_clockrdlock (&r, clockid, &ts) != 0)
+ FAIL_EXIT1 ("round %Zu: rwlock_%srdlock failed\n", cnt, fnname);
+ }
+
+ printf ("%zu: got %srdlock\n", cnt, fnname);
+
+ struct thread_args args;
+ args.rwlock = &r;
+ args.clockid = clockid;
+ args.fnname = fnname;
+ pthread_t th = xpthread_create (NULL, tf, &args);
+ void *status = xpthread_join (th);
if (status != NULL)
- {
- printf ("failure in round %Zu\n", cnt);
- exit (1);
- }
+ FAIL_EXIT1 ("failure in round %Zu\n", cnt);
if (pthread_rwlock_destroy (&r) != 0)
- {
- printf ("round %Zu: rwlock_destroy failed\n", cnt);
- exit (1);
- }
+ FAIL_EXIT1 ("round %Zu: rwlock_destroy failed\n", cnt);
}
return 0;
}
-#define TEST_FUNCTION do_test ()
-#include "../test-skeleton.c"
+static int
+do_test (void)
+{
+ do_test_clock (CLOCK_USE_TIMEDLOCK, "timed");
+ do_test_clock (CLOCK_MONOTONIC, "clock(monotonic)");
+ do_test_clock (CLOCK_REALTIME, "clock(realtime)");
+
+ return 0;
+}
+
+#include <support/test-driver.c>