aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2003-02-15 20:54:25 +0000
committerUlrich Drepper <drepper@redhat.com>2003-02-15 20:54:25 +0000
commitb2f05465748e7e1c0105776a1e0ceda7f7a599b0 (patch)
treeb547b7407e236dbe2f799bc27cee32d3306bc0b5
parentc3bb9ee1bc384edeec9ca991f58c162b167a558f (diff)
downloadglibc-b2f05465748e7e1c0105776a1e0ceda7f7a599b0.tar
glibc-b2f05465748e7e1c0105776a1e0ceda7f7a599b0.tar.gz
glibc-b2f05465748e7e1c0105776a1e0ceda7f7a599b0.tar.bz2
glibc-b2f05465748e7e1c0105776a1e0ceda7f7a599b0.zip
Update.
* tst-mutex2.c: Tests of trylock and unlock with ERROR mutexes.
-rw-r--r--nptl/ChangeLog1
-rw-r--r--nptl/tst-mutex2.c154
-rw-r--r--nptl/tst-mutex3.c95
3 files changed, 231 insertions, 19 deletions
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index 1dc5f231bb..f928819b78 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,5 +1,6 @@
2003-02-15 Ulrich Drepper <drepper@redhat.com>
+ * tst-mutex2.c: Tests of trylock and unlock with ERROR mutexes.
* tst-mutex3.c (do_test): Add tests for trylock with RECURSIVE mutexes.
* sysdeps/unix/sysv/linux/pthread_kill.c (__pthread_kill): Don't
diff --git a/nptl/tst-mutex2.c b/nptl/tst-mutex2.c
index 21948a9f5b..ee90fa7346 100644
--- a/nptl/tst-mutex2.c
+++ b/nptl/tst-mutex2.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.
@@ -22,75 +22,197 @@
#include <stdio.h>
+static pthread_mutex_t m;
+static pthread_barrier_t b;
+
+
+static void *
+tf (void *arg)
+{
+ int e = pthread_mutex_unlock (&m);
+ if (e == 0)
+ {
+ puts ("child: 1st mutex_unlock succeeded");
+ exit (1);
+ }
+ else if (e != EPERM)
+ {
+ puts ("child: 1st mutex_unlock error != EPERM");
+ exit (1);
+ }
+
+ e = pthread_mutex_trylock (&m);
+ if (e == 0)
+ {
+ puts ("child: 1st trylock suceeded");
+ exit (1);
+ }
+ if (e != EBUSY)
+ {
+ puts ("child: 1st trylock didn't return EBUSY");
+ exit (1);
+ }
+
+ e = pthread_barrier_wait (&b);
+ if (e != 0 && e != PTHREAD_BARRIER_SERIAL_THREAD)
+ {
+ puts ("child: 1st barrier_wait failed");
+ exit (1);
+ }
+
+ e = pthread_barrier_wait (&b);
+ if (e != 0 && e != PTHREAD_BARRIER_SERIAL_THREAD)
+ {
+ puts ("child: 2nd barrier_wait failed");
+ exit (1);
+ }
+
+ e = pthread_mutex_unlock (&m);
+ if (e == 0)
+ {
+ puts ("child: 2nd mutex_unlock succeeded");
+ exit (1);
+ }
+ else if (e != EPERM)
+ {
+ puts ("child: 2nd mutex_unlock error != EPERM");
+ exit (1);
+ }
+
+ if (pthread_mutex_trylock (&m) != 0)
+ {
+ puts ("child: 2nd trylock failed");
+ exit (1);
+ }
+
+ if (pthread_mutex_unlock (&m) != 0)
+ {
+ puts ("child: 3rd mutex_unlock failed");
+ exit (1);
+ }
+
+ return NULL;
+}
+
+
static int
do_test (void)
{
- pthread_mutex_t m;
pthread_mutexattr_t a;
int e;
if (pthread_mutexattr_init (&a) != 0)
{
puts ("mutexattr_init failed");
- return 1;
+ exit (1);
}
if (pthread_mutexattr_settype (&a, PTHREAD_MUTEX_ERRORCHECK) != 0)
{
puts ("mutexattr_settype failed");
- return 1;
+ exit (1);
}
if (pthread_mutex_init (&m, &a) != 0)
{
puts ("mutex_init failed");
- return 1;
+ exit (1);
+ }
+
+ if (pthread_barrier_init (&b, NULL, 2) != 0)
+ {
+ puts ("barrier_init failed");
+ exit (1);
+ }
+
+ if ((e = pthread_mutex_unlock (&m)) == 0)
+ {
+ puts ("1st mutex_unlock succeeded");
+ exit (1);
+ }
+ else if (e != EPERM)
+ {
+ puts ("1st mutex_unlock error != EPERM");
+ exit (1);
}
if (pthread_mutex_lock (&m) != 0)
{
puts ("mutex_lock failed");
- return 1;
+ exit (1);
}
if ((e = pthread_mutex_lock (&m)) == 0)
{
puts ("2nd mutex_lock succeeded");
- return 1;
+ exit (1);
}
else if (e != EDEADLK)
{
puts ("2nd mutex_lock error != EDEADLK");
- return 1;
+ exit (1);
+ }
+
+ pthread_t th;
+ if (pthread_create (&th, NULL, tf, NULL) != 0)
+ {
+ puts ("create failed");
+ exit (1);
+ }
+
+ e = pthread_barrier_wait (&b);
+ if (e != 0 && e != PTHREAD_BARRIER_SERIAL_THREAD)
+ {
+ puts ("1st barrier_wait failed");
+ exit (1);
}
if (pthread_mutex_unlock (&m) != 0)
{
- puts ("mutex_unlock failed");
- return 1;
+ puts ("2nd mutex_unlock failed");
+ exit (1);
}
if ((e = pthread_mutex_unlock (&m)) == 0)
{
- puts ("2nd mutex_unlock succeeded");
- return 1;
+ puts ("3rd mutex_unlock succeeded");
+ exit (1);
}
else if (e != EPERM)
{
- puts ("2nd mutex_unlock error != EPERM");
- return 1;
+ puts ("3rd mutex_unlock error != EPERM");
+ exit (1);
+ }
+
+ e = pthread_barrier_wait (&b);
+ if (e != 0 && e != PTHREAD_BARRIER_SERIAL_THREAD)
+ {
+ puts ("2nd barrier_wait failed");
+ exit (1);
+ }
+
+ if (pthread_join (th, NULL) != 0)
+ {
+ puts ("join failed");
+ exit (1);
}
if (pthread_mutex_destroy (&m) != 0)
{
puts ("mutex_destroy failed");
- return 1;
+ exit (1);
+ }
+
+ if (pthread_barrier_destroy (&b) != 0)
+ {
+ puts ("barrier_destroy failed");
+ exit (1);
}
if (pthread_mutexattr_destroy (&a) != 0)
{
puts ("mutexattr_destroy failed");
- return 1;
+ exit (1);
}
return 0;
diff --git a/nptl/tst-mutex3.c b/nptl/tst-mutex3.c
index c45637b5cf..8e57924ba6 100644
--- a/nptl/tst-mutex3.c
+++ b/nptl/tst-mutex3.c
@@ -24,12 +24,25 @@
static pthread_mutex_t m;
+static pthread_barrier_t b;
static void *
tf (void *arg)
{
- int e = pthread_mutex_trylock (&m);
+ int e = pthread_mutex_unlock (&m);
+ if (e == 0)
+ {
+ puts ("1st mutex_unlock in child succeeded");
+ exit (1);
+ }
+ if (e != EPERM)
+ {
+ puts ("1st mutex_unlock in child didn't return EPERM");
+ exit (1);
+ }
+
+ e = pthread_mutex_trylock (&m);
if (e == 0)
{
puts ("mutex_trylock in second thread succeeded");
@@ -41,6 +54,44 @@ tf (void *arg)
exit (1);
}
+ e = pthread_barrier_wait (&b);
+ if (e != 0 && e != PTHREAD_BARRIER_SERIAL_THREAD)
+ {
+ puts ("barrier_wait failed");
+ exit (1);
+ }
+
+ e = pthread_barrier_wait (&b);
+ if (e != 0 && e != PTHREAD_BARRIER_SERIAL_THREAD)
+ {
+ puts ("barrier_wait failed");
+ exit (1);
+ }
+
+ e = pthread_mutex_unlock (&m);
+ if (e == 0)
+ {
+ puts ("2nd mutex_unlock in child succeeded");
+ exit (1);
+ }
+ if (e != EPERM)
+ {
+ puts ("2nd mutex_unlock in child didn't return EPERM");
+ exit (1);
+ }
+
+ if (pthread_mutex_trylock (&m) != 0)
+ {
+ puts ("2nd mutex_trylock in second thread failed");
+ exit (1);
+ }
+
+ if (pthread_mutex_unlock (&m) != 0)
+ {
+ puts ("3rd mutex_unlock in second thread failed");
+ exit (1);
+ }
+
return NULL;
}
@@ -68,6 +119,12 @@ do_test (void)
return 1;
}
+ if (pthread_barrier_init (&b, NULL, 2) != 0)
+ {
+ puts ("barrier_init failed");
+ return 1;
+ }
+
if (pthread_mutex_lock (&m) != 0)
{
puts ("mutex_lock failed");
@@ -105,9 +162,10 @@ do_test (void)
return 1;
}
- if (pthread_join (th, NULL) != 0)
+ int e = pthread_barrier_wait (&b);
+ if (e != 0 && e != PTHREAD_BARRIER_SERIAL_THREAD)
{
- puts ("join failed");
+ puts ("barrier_wait failed");
return 1;
}
@@ -117,6 +175,37 @@ do_test (void)
return 1;
}
+ e = pthread_mutex_unlock (&m);
+ if (e == 0)
+ {
+ puts ("4th mutex_unlock succeeded");
+ return 1;
+ }
+ if (e != EPERM)
+ {
+ puts ("4th mutex_unlock didn't return EPERM");
+ return 1;
+ }
+
+ e = pthread_barrier_wait (&b);
+ if (e != 0 && e != PTHREAD_BARRIER_SERIAL_THREAD)
+ {
+ puts ("barrier_wait failed");
+ return 1;
+ }
+
+ if (pthread_join (th, NULL) != 0)
+ {
+ puts ("join failed");
+ return 1;
+ }
+
+ if (pthread_barrier_destroy (&b) != 0)
+ {
+ puts ("barrier_destroy failed");
+ return 1;
+ }
+
if (pthread_mutex_destroy (&m) != 0)
{
puts ("mutex_destroy failed");