From 63795987cfb04837f6bf6fc6cbd44b3d8f71cfd2 Mon Sep 17 00:00:00 2001 From: green Date: Sun, 31 Oct 2004 05:03:50 +0000 Subject: Make pthread_mutex_trylock(3) return EBUSY on failure, as all software packages expect and seems to be most correct according to the slightly- ambiguous standards. MFC after: 1 month Corroborated by: POSIX Reviewed by: silence on threads@ --- lib/libpthread/thread/thr_mutex.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'lib/libpthread') diff --git a/lib/libpthread/thread/thr_mutex.c b/lib/libpthread/thread/thr_mutex.c index 1232f33..047dca5 100644 --- a/lib/libpthread/thread/thr_mutex.c +++ b/lib/libpthread/thread/thr_mutex.c @@ -911,14 +911,7 @@ mutex_self_trylock(struct pthread *curthread, pthread_mutex_t m) /* case PTHREAD_MUTEX_DEFAULT: */ case PTHREAD_MUTEX_ERRORCHECK: case PTHREAD_MUTEX_NORMAL: - /* - * POSIX specifies that mutexes should return EDEADLK if a - * recursive lock is detected. - */ - if (m->m_owner == curthread) - ret = EDEADLK; - else - ret = EBUSY; + ret = EBUSY; break; case PTHREAD_MUTEX_RECURSIVE: -- cgit v1.1