aboutsummaryrefslogtreecommitdiff
path: root/nptl/tst-mutex4.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2006-07-29 04:42:09 +0000
committerUlrich Drepper <drepper@redhat.com>2006-07-29 04:42:09 +0000
commitdf47504c78f82b9c975b2a48a6c8b6dd73a79ce1 (patch)
tree6706cdb46e20a69b3a4b4bffa9a29db9eeaff9c2 /nptl/tst-mutex4.c
parent6822f05652c50c63cdaacffd41b5ad2db0f027ce (diff)
downloadglibc-df47504c78f82b9c975b2a48a6c8b6dd73a79ce1.zip
glibc-df47504c78f82b9c975b2a48a6c8b6dd73a79ce1.tar.gz
glibc-df47504c78f82b9c975b2a48a6c8b6dd73a79ce1.tar.bz2
2006-07-28 Ulrich Drepper <drepper@redhat.com>
Jakub Jelinek <jakub@redhat.com> * descr.h: Change ENQUEUE_MUTEX and DEQUEUE_MUTEX for bit 0 notification of PI mutex. Add ENQUEUE_MUTEX_PI. * pthreadP.h: Define PTHREAD_MUTEX_PI_* macros for PI mutex types. * pthread_mutex_setprioceilining.c: Adjust for mutex type name change. * pthread_mutex_init.c: Add support for priority inheritance mutex. * pthread_mutex_lock.c: Likewise. * pthread_mutex_timedlock.c: Likewise. * pthread_mutex_trylock.c: Likewise. * pthread_mutex_unlock.c: Likewise. * sysdeps/pthread/pthread_cond_broadcast.c: For PI mutexes wake all mutexes. * sysdeps/unix/sysv/linux/i386/i486/pthread_cond_broadcast.c: Likewise. * sysdeps/unix/sysv/linux/x86_64/pthread_cond_broadcast.c: Likewise. * sysdeps/unix/sysv/linux/pthread-pi-defines.sym: New file. * sysdeps/unix/sysv/linux/Makefile (gen-as-const-header): Add pthread-pi-defines.sym. * sysdeps/unix/sysv/linux/i386/lowlevellock.h: Define FUTEX_LOCK_PI, FUTEX_UNLOCK_PI, and FUTEX_TRYLOCK_PI. * sysdeps/unix/sysv/linux/x86_64/lowlevellock.h: Likewise. * sysdeps/unix/sysv/linux/bits/posix_opt.h: Define _POSIX_THREAD_PRIO_INHERIT to 200112L. * tst-mutex1.c: Adjust to allow use in PI mutex test. * tst-mutex2.c: Likewise. * tst-mutex3.c: Likewise. * tst-mutex4.c: Likewise. * tst-mutex5.c: Likewise. * tst-mutex6.c: Likewise. * tst-mutex7.c: Likewise. * tst-mutex7a.c: Likewise. * tst-mutex8.c: Likewise. * tst-mutex9.c: Likewise. * tst-robust1.c: Likewise. * tst-robust7.c: Likewise. * tst-robust8.c: Likewise. * tst-mutexpi1.c: New file. * tst-mutexpi2.c: New file. * tst-mutexpi3.c: New file. * tst-mutexpi4.c: New file. * tst-mutexpi5.c: New file. * tst-mutexpi6.c: New file. * tst-mutexpi7.c: New file. * tst-mutexpi7a.c: New file. * tst-mutexpi8.c: New file. * tst-mutexpi9.c: New file. * tst-robust1.c: New file. * tst-robust2.c: New file. * tst-robust3.c: New file. * tst-robust4.c: New file. * tst-robust5.c: New file. * tst-robust6.c: New file. * tst-robust7.c: New file. * tst-robust8.c: New file. * Makefile (tests): Add the new tests. * pthread_create.c (start_thread): Add some casts to avoid warnings. * pthread_mutex_destroy.c: Remove unneeded label.
Diffstat (limited to 'nptl/tst-mutex4.c')
-rw-r--r--nptl/tst-mutex4.c99
1 files changed, 93 insertions, 6 deletions
diff --git a/nptl/tst-mutex4.c b/nptl/tst-mutex4.c
index 0ce7313..9699c2d 100644
--- a/nptl/tst-mutex4.c
+++ b/nptl/tst-mutex4.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc.
+/* Copyright (C) 2002, 2003, 2004, 2006 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
@@ -42,6 +42,8 @@ do_test (void)
char *p;
int err;
int s;
+ pthread_barrier_t *b;
+ pthread_barrierattr_t ba;
fd = mkstemp (tmpfname);
if (fd == -1)
@@ -70,9 +72,12 @@ do_test (void)
return 1;
}
- m = (pthread_mutex_t *) (((uintptr_t) mem + __alignof (pthread_mutex_t))
+ m = (pthread_mutex_t *) (((uintptr_t) mem + __alignof (pthread_mutex_t) - 1)
& ~(__alignof (pthread_mutex_t) - 1));
- p = (char *) (m + 1);
+ b = (pthread_barrier_t *) (((uintptr_t) (m + 1)
+ + __alignof (pthread_barrier_t) - 1)
+ & ~(__alignof (pthread_barrier_t) - 1));
+ p = (char *) (b + 1);
if (pthread_mutexattr_init (&a) != 0)
{
@@ -110,8 +115,23 @@ do_test (void)
return 1;
}
- if (pthread_mutex_init (m, &a) != 0)
+#ifdef ENABLE_PI
+ if (pthread_mutexattr_setprotocol (&a, PTHREAD_PRIO_INHERIT) != 0)
{
+ puts ("pthread_mutexattr_setprotocol failed");
+ return 1;
+ }
+#endif
+
+ if ((err = pthread_mutex_init (m, &a)) != 0)
+ {
+#ifdef ENABLE_PI
+ if (err == ENOTSUP)
+ {
+ puts ("PI mutexes unsupported");
+ return 0;
+ }
+#endif
puts ("mutex_init failed");
return 1;
}
@@ -128,6 +148,30 @@ do_test (void)
return 1;
}
+ if (pthread_barrierattr_init (&ba) != 0)
+ {
+ puts ("barrierattr_init failed");
+ return 1;
+ }
+
+ if (pthread_barrierattr_setpshared (&ba, PTHREAD_PROCESS_SHARED) != 0)
+ {
+ puts ("barrierattr_setpshared failed");
+ return 1;
+ }
+
+ if (pthread_barrier_init (b, &ba, 2) != 0)
+ {
+ puts ("barrier_init failed");
+ return 1;
+ }
+
+ if (pthread_barrierattr_destroy (&ba) != 0)
+ {
+ puts ("barrierattr_destroy failed");
+ return 1;
+ }
+
err = pthread_mutex_trylock (m);
if (err == 0)
{
@@ -142,6 +186,12 @@ do_test (void)
*p = 0;
+ if (pthread_mutex_unlock (m) != 0)
+ {
+ puts ("parent: 1st mutex_unlock failed");
+ return 1;
+ }
+
puts ("going to fork now");
pid = fork ();
if (pid == -1)
@@ -151,7 +201,19 @@ do_test (void)
}
else if (pid == 0)
{
- /* Play some lock ping-pong. It's our turn to unlock first. */
+ if (pthread_mutex_lock (m) != 0)
+ {
+ puts ("child: mutex_lock failed");
+ return 1;
+ }
+
+ int e = pthread_barrier_wait (b);
+ if (e != 0 && e != PTHREAD_BARRIER_SERIAL_THREAD)
+ {
+ puts ("child: barrier_wait failed");
+ return 1;
+ }
+
if ((*p)++ != 0)
{
puts ("child: *p != 0");
@@ -160,7 +222,7 @@ do_test (void)
if (pthread_mutex_unlock (m) != 0)
{
- puts ("child: 1st mutex_unlock failed");
+ puts ("child: mutex_unlock failed");
return 1;
}
@@ -168,6 +230,13 @@ do_test (void)
}
else
{
+ int e = pthread_barrier_wait (b);
+ if (e != 0 && e != PTHREAD_BARRIER_SERIAL_THREAD)
+ {
+ puts ("parent: barrier_wait failed");
+ return 1;
+ }
+
if (pthread_mutex_lock (m) != 0)
{
puts ("parent: 2nd mutex_lock failed");
@@ -180,6 +249,24 @@ do_test (void)
return 1;
}
+ if (pthread_mutex_unlock (m) != 0)
+ {
+ puts ("parent: 2nd mutex_unlock failed");
+ return 1;
+ }
+
+ if (pthread_mutex_destroy (m) != 0)
+ {
+ puts ("mutex_destroy failed");
+ return 1;
+ }
+
+ if (pthread_barrier_destroy (b) != 0)
+ {
+ puts ("barrier_destroy failed");
+ return 1;
+ }
+
puts ("parent done");
}