aboutsummaryrefslogtreecommitdiff
path: root/nptl/tst-cond2.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2003-02-08 19:44:33 +0000
committerUlrich Drepper <drepper@redhat.com>2003-02-08 19:44:33 +0000
commit696e556ea9b85beb8e6bad132d3d4dbdb5ab36a6 (patch)
tree4db6b271413792b54210ce0a214668cdde164d41 /nptl/tst-cond2.c
parent34c86f425441d13e9e6cebd2ce1ebd99fc373ce2 (diff)
downloadglibc-696e556ea9b85beb8e6bad132d3d4dbdb5ab36a6.tar
glibc-696e556ea9b85beb8e6bad132d3d4dbdb5ab36a6.tar.gz
glibc-696e556ea9b85beb8e6bad132d3d4dbdb5ab36a6.tar.bz2
glibc-696e556ea9b85beb8e6bad132d3d4dbdb5ab36a6.zip
Update.
2003-02-08 Ulrich Drepper <drepper@redhat.com> * tst-cond2.c: Rearrange code to not rely on behavior undefined according to POSIX. * tst-basic2.c (do_test): Lock mutex before creating the thread.
Diffstat (limited to 'nptl/tst-cond2.c')
-rw-r--r--nptl/tst-cond2.c38
1 files changed, 29 insertions, 9 deletions
diff --git a/nptl/tst-cond2.c b/nptl/tst-cond2.c
index d1f3d0fd38..2610a6ad8c 100644
--- a/nptl/tst-cond2.c
+++ b/nptl/tst-cond2.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 <drepper@redhat.com>, 2002.
@@ -26,6 +26,8 @@
static pthread_mutex_t mut = PTHREAD_MUTEX_INITIALIZER;
static pthread_cond_t cond = PTHREAD_COND_INITIALIZER;
+static pthread_mutex_t syncm = PTHREAD_MUTEX_INITIALIZER;
+
static void *
tf (void *a)
@@ -33,6 +35,18 @@ tf (void *a)
int i = (long int) a;
int err;
+ printf ("child %d: lock\n", i);
+
+ err = pthread_mutex_lock (&mut);
+ if (err != 0)
+ error (EXIT_FAILURE, err, "locking in child failed");
+
+ printf ("child %d: unlock sync\n", i);
+
+ err = pthread_mutex_unlock (&syncm);
+ if (err != 0)
+ error (EXIT_FAILURE, err, "child %d: unlock[1] failed", i);
+
printf ("child %d: wait\n", i);
err = pthread_cond_wait (&cond, &mut);
@@ -43,7 +57,7 @@ tf (void *a)
err = pthread_mutex_unlock (&mut);
if (err != 0)
- error (EXIT_FAILURE, err, "child %d: unlock failed", i);
+ error (EXIT_FAILURE, err, "child %d: unlock[2] failed", i);
printf ("child %d: done\n", i);
@@ -65,7 +79,7 @@ do_test (void)
puts ("first lock");
- err = pthread_mutex_lock (&mut);
+ err = pthread_mutex_lock (&syncm);
if (err != 0)
error (EXIT_FAILURE, err, "initial locking failed");
@@ -80,16 +94,18 @@ do_test (void)
printf ("wait for child %d\n", i);
/* Lock and thereby wait for the child to start up and get the
- conditional variable. */
- pthread_mutex_lock (&mut);
+ mutex for the conditional variable. */
+ pthread_mutex_lock (&syncm);
+ /* Unlock right away. Yes, we can use barriers but then we
+ would test more functionality here. */
+ pthread_mutex_unlock (&syncm);
}
- puts ("final unlock");
+ puts ("get lock outselves");
- /* Unlock in preparation of the broadcast. */
- err = pthread_mutex_unlock (&mut);
+ err = pthread_mutex_lock (&mut);
if (err != 0)
- error (EXIT_FAILURE, err, "parent: unlock failed");
+ error (EXIT_FAILURE, err, "mut locking failed");
puts ("broadcast");
@@ -98,6 +114,10 @@ do_test (void)
if (err != 0)
error (EXIT_FAILURE, err, "parent: broadcast failed");
+ err = pthread_mutex_unlock (&mut);
+ if (err != 0)
+ error (EXIT_FAILURE, err, "mut unlocking failed");
+
/* Join all threads. */
for (i = 0; i < N; ++i)
{