diff options
| author | rpj <rpj> | 2011-07-01 00:51:56 +0000 |
|---|---|---|
| committer | rpj <rpj> | 2011-07-01 00:51:56 +0000 |
| commit | 1e0bb8a09c86d144f3779bc4d5724afe3f637922 (patch) | |
| tree | b4c0c0a6221360107d2bf816523594352eac5f34 /pthread_mutex_timedlock.c | |
| parent | 5af9e85e56dbcae60f771619131ecbc17980fdaa (diff) | |
Redo Interlocked macros; see the ChangeLog
Diffstat (limited to 'pthread_mutex_timedlock.c')
| -rw-r--r-- | pthread_mutex_timedlock.c | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/pthread_mutex_timedlock.c b/pthread_mutex_timedlock.c index 14843af..a2fd5a0 100644 --- a/pthread_mutex_timedlock.c +++ b/pthread_mutex_timedlock.c @@ -138,13 +138,13 @@ pthread_mutex_timedlock (pthread_mutex_t * mutex, { if (mx->kind == PTHREAD_MUTEX_NORMAL) { - if ((PTW32_INTERLOCKED_VALUE) PTW32_INTERLOCKED_EXCHANGE( + if ((PTW32_INTERLOCKED_LONG) PTW32_INTERLOCKED_EXCHANGE_LONG( (PTW32_INTERLOCKED_PTR) &mx->lock_idx, - (PTW32_INTERLOCKED_VALUE) 1) != 0) + (PTW32_INTERLOCKED_LONG) 1) != 0) { - while ((PTW32_INTERLOCKED_VALUE) PTW32_INTERLOCKED_EXCHANGE( + while ((PTW32_INTERLOCKED_LONG) PTW32_INTERLOCKED_EXCHANGE_LONG( (PTW32_INTERLOCKED_PTR) &mx->lock_idx, - (PTW32_INTERLOCKED_VALUE) -1) != 0) + (PTW32_INTERLOCKED_LONG) -1) != 0) { if (0 != (result = ptw32_timed_eventwait (mx->event, abstime))) { @@ -157,10 +157,10 @@ pthread_mutex_timedlock (pthread_mutex_t * mutex, { pthread_t self = pthread_self(); - if ((PTW32_INTERLOCKED_VALUE) PTW32_INTERLOCKED_COMPARE_EXCHANGE( + if ((PTW32_INTERLOCKED_LONG) PTW32_INTERLOCKED_COMPARE_EXCHANGE_LONG( (PTW32_INTERLOCKED_PTR) &mx->lock_idx, - (PTW32_INTERLOCKED_VALUE) 1, - (PTW32_INTERLOCKED_VALUE) 0) == 0) + (PTW32_INTERLOCKED_LONG) 1, + (PTW32_INTERLOCKED_LONG) 0) == 0) { mx->recursive_count = 1; mx->ownerThread = self; @@ -180,9 +180,9 @@ pthread_mutex_timedlock (pthread_mutex_t * mutex, } else { - while ((PTW32_INTERLOCKED_VALUE) PTW32_INTERLOCKED_EXCHANGE( + while ((PTW32_INTERLOCKED_LONG) PTW32_INTERLOCKED_EXCHANGE_LONG( (PTW32_INTERLOCKED_PTR) &mx->lock_idx, - (PTW32_INTERLOCKED_VALUE) -1) != 0) + (PTW32_INTERLOCKED_LONG) -1) != 0) { if (0 != (result = ptw32_timed_eventwait (mx->event, abstime))) { @@ -205,9 +205,9 @@ pthread_mutex_timedlock (pthread_mutex_t * mutex, */ ptw32_robust_state_t* statePtr = &mx->robustNode->stateInconsistent; - if ((PTW32_INTERLOCKED_VALUE)PTW32_ROBUST_NOTRECOVERABLE == PTW32_INTERLOCKED_EXCHANGE_ADD( + if ((PTW32_INTERLOCKED_LONG)PTW32_ROBUST_NOTRECOVERABLE == PTW32_INTERLOCKED_EXCHANGE_ADD_LONG( (PTW32_INTERLOCKED_PTR)statePtr, - (PTW32_INTERLOCKED_VALUE)0)) + (PTW32_INTERLOCKED_LONG)0)) { result = ENOTRECOVERABLE; } @@ -219,23 +219,23 @@ pthread_mutex_timedlock (pthread_mutex_t * mutex, if (PTHREAD_MUTEX_NORMAL == kind) { - if ((PTW32_INTERLOCKED_VALUE) PTW32_INTERLOCKED_EXCHANGE( + if ((PTW32_INTERLOCKED_LONG) PTW32_INTERLOCKED_EXCHANGE_LONG( (PTW32_INTERLOCKED_PTR) &mx->lock_idx, - (PTW32_INTERLOCKED_VALUE) 1) != 0) + (PTW32_INTERLOCKED_LONG) 1) != 0) { while (0 == (result = ptw32_robust_mutex_inherit(mutex)) - && (PTW32_INTERLOCKED_VALUE) PTW32_INTERLOCKED_EXCHANGE( + && (PTW32_INTERLOCKED_LONG) PTW32_INTERLOCKED_EXCHANGE_LONG( (PTW32_INTERLOCKED_PTR) &mx->lock_idx, - (PTW32_INTERLOCKED_VALUE) -1) != 0) + (PTW32_INTERLOCKED_LONG) -1) != 0) { if (0 != (result = ptw32_timed_eventwait (mx->event, abstime))) { return result; } - if ((PTW32_INTERLOCKED_VALUE)PTW32_ROBUST_NOTRECOVERABLE == - PTW32_INTERLOCKED_EXCHANGE_ADD( + if ((PTW32_INTERLOCKED_LONG)PTW32_ROBUST_NOTRECOVERABLE == + PTW32_INTERLOCKED_EXCHANGE_ADD_LONG( (PTW32_INTERLOCKED_PTR)statePtr, - (PTW32_INTERLOCKED_VALUE)0)) + (PTW32_INTERLOCKED_LONG)0)) { /* Unblock the next thread */ SetEvent(mx->event); @@ -258,10 +258,10 @@ pthread_mutex_timedlock (pthread_mutex_t * mutex, { pthread_t self = pthread_self(); - if (0 == (PTW32_INTERLOCKED_VALUE) PTW32_INTERLOCKED_COMPARE_EXCHANGE( + if (0 == (PTW32_INTERLOCKED_LONG) PTW32_INTERLOCKED_COMPARE_EXCHANGE_LONG( (PTW32_INTERLOCKED_PTR) &mx->lock_idx, - (PTW32_INTERLOCKED_VALUE) 1, - (PTW32_INTERLOCKED_VALUE) 0)) + (PTW32_INTERLOCKED_LONG) 1, + (PTW32_INTERLOCKED_LONG) 0)) { mx->recursive_count = 1; /* @@ -286,9 +286,9 @@ pthread_mutex_timedlock (pthread_mutex_t * mutex, else { while (0 == (result = ptw32_robust_mutex_inherit(mutex)) - && (PTW32_INTERLOCKED_VALUE) PTW32_INTERLOCKED_EXCHANGE( + && (PTW32_INTERLOCKED_LONG) PTW32_INTERLOCKED_EXCHANGE_LONG( (PTW32_INTERLOCKED_PTR) &mx->lock_idx, - (PTW32_INTERLOCKED_VALUE) -1) != 0) + (PTW32_INTERLOCKED_LONG) -1) != 0) { if (0 != (result = ptw32_timed_eventwait (mx->event, abstime))) { @@ -296,10 +296,10 @@ pthread_mutex_timedlock (pthread_mutex_t * mutex, } } - if ((PTW32_INTERLOCKED_VALUE)PTW32_ROBUST_NOTRECOVERABLE == - PTW32_INTERLOCKED_EXCHANGE_ADD( + if ((PTW32_INTERLOCKED_LONG)PTW32_ROBUST_NOTRECOVERABLE == + PTW32_INTERLOCKED_EXCHANGE_ADD_LONG( (PTW32_INTERLOCKED_PTR)statePtr, - (PTW32_INTERLOCKED_VALUE)0)) + (PTW32_INTERLOCKED_LONG)0)) { /* Unblock the next thread */ SetEvent(mx->event); |