mirror of
https://sourceware.org/git/glibc.git
synced 2025-08-01 10:06:57 +03:00
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.
This commit is contained in:
@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 2002, 2003 Free Software Foundation, Inc.
|
||||
/* Copyright (C) 2002, 2003, 2006 Free Software Foundation, Inc.
|
||||
This file is part of the GNU C Library.
|
||||
Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
|
||||
|
||||
@ -105,115 +105,134 @@ do_test (void)
|
||||
if (pthread_mutexattr_init (&a) != 0)
|
||||
{
|
||||
puts ("mutexattr_init failed");
|
||||
exit (1);
|
||||
return 1;
|
||||
}
|
||||
|
||||
if (pthread_mutexattr_settype (&a, PTHREAD_MUTEX_ERRORCHECK) != 0)
|
||||
{
|
||||
puts ("mutexattr_settype failed");
|
||||
exit (1);
|
||||
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
|
||||
|
||||
e = pthread_mutex_init (&m, &a);
|
||||
if (e != 0)
|
||||
{
|
||||
#ifdef ENABLE_PI
|
||||
if (e == ENOTSUP)
|
||||
{
|
||||
puts ("PI mutexes unsupported");
|
||||
return 0;
|
||||
}
|
||||
#endif
|
||||
puts ("mutex_init failed");
|
||||
exit (1);
|
||||
return 1;
|
||||
}
|
||||
|
||||
if (pthread_barrier_init (&b, NULL, 2) != 0)
|
||||
{
|
||||
puts ("barrier_init failed");
|
||||
exit (1);
|
||||
return 1;
|
||||
}
|
||||
|
||||
if ((e = pthread_mutex_unlock (&m)) == 0)
|
||||
e = pthread_mutex_unlock (&m);
|
||||
if (e == 0)
|
||||
{
|
||||
puts ("1st mutex_unlock succeeded");
|
||||
exit (1);
|
||||
return 1;
|
||||
}
|
||||
else if (e != EPERM)
|
||||
{
|
||||
puts ("1st mutex_unlock error != EPERM");
|
||||
exit (1);
|
||||
return 1;
|
||||
}
|
||||
|
||||
if (pthread_mutex_lock (&m) != 0)
|
||||
{
|
||||
puts ("mutex_lock failed");
|
||||
exit (1);
|
||||
return 1;
|
||||
}
|
||||
|
||||
if ((e = pthread_mutex_lock (&m)) == 0)
|
||||
e = pthread_mutex_lock (&m);
|
||||
if (e == 0)
|
||||
{
|
||||
puts ("2nd mutex_lock succeeded");
|
||||
exit (1);
|
||||
return 1;
|
||||
}
|
||||
else if (e != EDEADLK)
|
||||
{
|
||||
puts ("2nd mutex_lock error != EDEADLK");
|
||||
exit (1);
|
||||
return 1;
|
||||
}
|
||||
|
||||
pthread_t th;
|
||||
if (pthread_create (&th, NULL, tf, NULL) != 0)
|
||||
{
|
||||
puts ("create failed");
|
||||
exit (1);
|
||||
return 1;
|
||||
}
|
||||
|
||||
e = pthread_barrier_wait (&b);
|
||||
if (e != 0 && e != PTHREAD_BARRIER_SERIAL_THREAD)
|
||||
{
|
||||
puts ("1st barrier_wait failed");
|
||||
exit (1);
|
||||
return 1;
|
||||
}
|
||||
|
||||
if (pthread_mutex_unlock (&m) != 0)
|
||||
{
|
||||
puts ("2nd mutex_unlock failed");
|
||||
exit (1);
|
||||
return 1;
|
||||
}
|
||||
|
||||
if ((e = pthread_mutex_unlock (&m)) == 0)
|
||||
e = pthread_mutex_unlock (&m);
|
||||
if (e == 0)
|
||||
{
|
||||
puts ("3rd mutex_unlock succeeded");
|
||||
exit (1);
|
||||
return 1;
|
||||
}
|
||||
else if (e != EPERM)
|
||||
{
|
||||
puts ("3rd mutex_unlock error != EPERM");
|
||||
exit (1);
|
||||
return 1;
|
||||
}
|
||||
|
||||
e = pthread_barrier_wait (&b);
|
||||
if (e != 0 && e != PTHREAD_BARRIER_SERIAL_THREAD)
|
||||
{
|
||||
puts ("2nd barrier_wait failed");
|
||||
exit (1);
|
||||
return 1;
|
||||
}
|
||||
|
||||
if (pthread_join (th, NULL) != 0)
|
||||
{
|
||||
puts ("join failed");
|
||||
exit (1);
|
||||
return 1;
|
||||
}
|
||||
|
||||
if (pthread_mutex_destroy (&m) != 0)
|
||||
{
|
||||
puts ("mutex_destroy failed");
|
||||
exit (1);
|
||||
return 1;
|
||||
}
|
||||
|
||||
if (pthread_barrier_destroy (&b) != 0)
|
||||
{
|
||||
puts ("barrier_destroy failed");
|
||||
exit (1);
|
||||
return 1;
|
||||
}
|
||||
|
||||
if (pthread_mutexattr_destroy (&a) != 0)
|
||||
{
|
||||
puts ("mutexattr_destroy failed");
|
||||
exit (1);
|
||||
return 1;
|
||||
}
|
||||
|
||||
return 0;
|
||||
|
Reference in New Issue
Block a user