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_lock.c | |
| parent | 395de1c8a9a25c343a6784cfc3ecf729c48024d8 (diff) | |
Robust mutex streamlining
Diffstat (limited to 'pthread_mutex_lock.c')
| -rw-r--r-- | pthread_mutex_lock.c | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/pthread_mutex_lock.c b/pthread_mutex_lock.c index eb81c9b..ba410a6 100644 --- a/pthread_mutex_lock.c +++ b/pthread_mutex_lock.c @@ -172,13 +172,6 @@ pthread_mutex_lock (pthread_mutex_t * mutex) (LPLONG) &mx->lock_idx, (LONG) -1) != 0) { -#if 0 - /* - * Only need to add the mutex to the list kept by the owner thread - * when a thread blocks on the mutex. - */ - ptw32_robust_mutex_add(mutex); -#endif if (WAIT_OBJECT_0 != WaitForSingleObject (mx->event, INFINITE)) { result = EINVAL; @@ -198,15 +191,11 @@ pthread_mutex_lock (pthread_mutex_t * mutex) } if (0 == result || EOWNERDEAD == result) { -#if 0 - mx->ownerThread = self; -#else /* * 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); -#endif } } else @@ -217,15 +206,11 @@ pthread_mutex_lock (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 { @@ -247,13 +232,6 @@ pthread_mutex_lock (pthread_mutex_t * mutex) (LPLONG) &mx->lock_idx, (LONG) -1) != 0) { -#if 0 - /* - * Only need to add the mutex to the list kept by the owner thread - * when a thread blocks on the mutex. - */ - ptw32_robust_mutex_add(mutex); -#endif if (WAIT_OBJECT_0 != WaitForSingleObject (mx->event, INFINITE)) { result = EINVAL; @@ -274,15 +252,11 @@ pthread_mutex_lock (pthread_mutex_t * mutex) 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 } } } |