From 559e1bc4051f90d7a014bd4e4f5649e136dec412 Mon Sep 17 00:00:00 2001 From: rpj Date: Fri, 25 Mar 2011 09:22:50 +0000 Subject: Robust mutex streamlining --- pthread_mutex_timedlock.c | 18 ------------------ 1 file changed, 18 deletions(-) (limited to 'pthread_mutex_timedlock.c') diff --git a/pthread_mutex_timedlock.c b/pthread_mutex_timedlock.c index d4c280d..3f759b5 100644 --- a/pthread_mutex_timedlock.c +++ b/pthread_mutex_timedlock.c @@ -228,9 +228,6 @@ pthread_mutex_timedlock (pthread_mutex_t * mutex, (LPLONG) &mx->lock_idx, (LONG) -1) != 0) { -#if 0 - ptw32_robust_mutex_add(mutex); -#endif if (0 != (result = ptw32_timed_eventwait (mx->event, abstime))) { return result; @@ -249,15 +246,11 @@ pthread_mutex_timedlock (pthread_mutex_t * mutex, if (0 == result || EOWNERDEAD == result) { -#if 1 /* * Add mutex to the per-thread robust mutex currently-held list. * If the thread terminates, all mutexes in this list will be unlocked. */ ptw32_robust_mutex_add(mutex, self); -#else - mx->ownerThread = self; -#endif } } } @@ -271,15 +264,11 @@ pthread_mutex_timedlock (pthread_mutex_t * mutex, (PTW32_INTERLOCKED_LONG) 0) == 0) { mx->recursive_count = 1; -#if 1 /* * Add mutex to the per-thread robust mutex currently-held list. * If the thread terminates, all mutexes in this list will be unlocked. */ ptw32_robust_mutex_add(mutex, self); -#else - mx->ownerThread = self; -#endif } else { @@ -301,9 +290,6 @@ pthread_mutex_timedlock (pthread_mutex_t * mutex, (LPLONG) &mx->lock_idx, (LONG) -1) != 0) { -#if 0 - ptw32_robust_mutex_add(mutex); -#endif if (0 != (result = ptw32_timed_eventwait (mx->event, abstime))) { return result; @@ -322,15 +308,11 @@ pthread_mutex_timedlock (pthread_mutex_t * mutex, else if (0 == result || EOWNERDEAD == result) { mx->recursive_count = 1; -#if 1 /* * Add mutex to the per-thread robust mutex currently-held list. * If the thread terminates, all mutexes in this list will be unlocked. */ ptw32_robust_mutex_add(mutex, self); -#else - mx->ownerThread = self; -#endif } } } -- cgit v1.2.3