diff options
| author | rpj <rpj> | 2011-03-25 09:22:50 +0000 |
|---|---|---|
| committer | rpj <rpj> | 2011-03-25 09:22:50 +0000 |
| commit | 559e1bc4051f90d7a014bd4e4f5649e136dec412 (patch) | |
| tree | 70e6f76c3b353b0b74b698a51088f5b9a38e53ab /pthread_mutex_timedlock.c | |
| parent | 395de1c8a9a25c343a6784cfc3ecf729c48024d8 (diff) | |
Robust mutex streamlining
Diffstat (limited to 'pthread_mutex_timedlock.c')
| -rw-r--r-- | pthread_mutex_timedlock.c | 18 |
1 files changed, 0 insertions, 18 deletions
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 } } } |