diff options
Diffstat (limited to 'winsup/testsuite/winsup.api/pthread/mutex6d.c')
-rw-r--r-- | winsup/testsuite/winsup.api/pthread/mutex6d.c | 31 |
1 files changed, 19 insertions, 12 deletions
diff --git a/winsup/testsuite/winsup.api/pthread/mutex6d.c b/winsup/testsuite/winsup.api/pthread/mutex6d.c index bcbcd9767..f39c1ac53 100644 --- a/winsup/testsuite/winsup.api/pthread/mutex6d.c +++ b/winsup/testsuite/winsup.api/pthread/mutex6d.c @@ -2,7 +2,8 @@ * mutex6d.c * * Tests PTHREAD_MUTEX_DEFAULT mutex type. - * The thread should behave the same way than an errorchecking mutex. + * Thread locks mutex twice (recursive lock). + * The thread should deadlock. * * Depends on API functions: * pthread_create() @@ -25,11 +26,12 @@ void * locker(void * arg) { assert(pthread_mutex_lock(&mutex) == 0); lockCount++; - assert(pthread_mutex_lock(&mutex) == EDEADLK); + + /* Should wait here (deadlocked) */ + assert(pthread_mutex_lock(&mutex) == 0); lockCount++; assert(pthread_mutex_unlock(&mutex) == 0); - assert(pthread_mutex_unlock(&mutex) == EPERM); - + return (void *) 555; } @@ -37,25 +39,30 @@ int main() { pthread_t t; - int result = 0; int mxType = -1; assert(pthread_mutexattr_init(&mxAttr) == 0); assert(pthread_mutexattr_settype(&mxAttr, PTHREAD_MUTEX_DEFAULT) == 0); assert(pthread_mutexattr_gettype(&mxAttr, &mxType) == 0); - assert(mxType == PTHREAD_MUTEX_DEFAULT); + assert(mxType == PTHREAD_MUTEX_NORMAL); assert(pthread_mutex_init(&mutex, &mxAttr) == 0); assert(pthread_create(&t, NULL, locker, NULL) == 0); - - assert(pthread_join(t, (void **) &result) == 0); - assert(result == 555); - assert(lockCount == 2); + Sleep(1000); - assert(pthread_mutex_destroy(&mutex) == 0); - assert(pthread_mutexattr_destroy(&mxAttr) == 0); + assert(lockCount == 1); + + /* + * Should succeed even though we don't own the lock + * because FAST mutexes don't check ownership. + */ + assert(pthread_mutex_unlock(&mutex) == 0); + + Sleep (1000); + + assert(lockCount == 2); exit(0); |