diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2013-07-19 15:00:11 +0200 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2013-07-22 16:57:23 +0200 |
| commit | 982e97463f66b09b79825c481f3b3f343ef361b8 (patch) | |
| tree | bf7d0a227442d89b4ac851227d7d9db344678932 /cpukit/posix/src/prwlocktimedwrlock.c | |
| parent | score: Create rwlock implementation header (diff) | |
| download | rtems-982e97463f66b09b79825c481f3b3f343ef361b8.tar.bz2 | |
score: Avoid direct usage of _Thread_Executing
Pass the executing thread as a function parameter. Obtain the executing
thread inside a thread dispatch critical section to avoid problems on
SMP.
Diffstat (limited to 'cpukit/posix/src/prwlocktimedwrlock.c')
| -rw-r--r-- | cpukit/posix/src/prwlocktimedwrlock.c | 27 |
1 files changed, 15 insertions, 12 deletions
diff --git a/cpukit/posix/src/prwlocktimedwrlock.c b/cpukit/posix/src/prwlocktimedwrlock.c index 7a4d76071e..5772159842 100644 --- a/cpukit/posix/src/prwlocktimedwrlock.c +++ b/cpukit/posix/src/prwlocktimedwrlock.c @@ -50,6 +50,7 @@ int pthread_rwlock_timedwrlock( Watchdog_Interval ticks; bool do_wait = true; POSIX_Absolute_timeout_conversion_results_t status; + Thread_Control *executing; if ( !rwlock ) return EINVAL; @@ -76,26 +77,28 @@ int pthread_rwlock_timedwrlock( case OBJECTS_LOCAL: + executing = _Thread_Executing; _CORE_RWLock_Obtain_for_writing( - &the_rwlock->RWLock, - *rwlock, - do_wait, - ticks, - NULL + &the_rwlock->RWLock, + executing, + *rwlock, + do_wait, + ticks, + NULL ); _Objects_Put( &the_rwlock->Object ); if ( !do_wait && - (_Thread_Executing->Wait.return_code == CORE_RWLOCK_UNAVAILABLE) ) { - if ( status == POSIX_ABSOLUTE_TIMEOUT_INVALID ) - return EINVAL; - if ( status == POSIX_ABSOLUTE_TIMEOUT_IS_IN_PAST || - status == POSIX_ABSOLUTE_TIMEOUT_IS_NOW ) - return ETIMEDOUT; + (executing->Wait.return_code == CORE_RWLOCK_UNAVAILABLE) ) { + if ( status == POSIX_ABSOLUTE_TIMEOUT_INVALID ) + return EINVAL; + if ( status == POSIX_ABSOLUTE_TIMEOUT_IS_IN_PAST || + status == POSIX_ABSOLUTE_TIMEOUT_IS_NOW ) + return ETIMEDOUT; } return _POSIX_RWLock_Translate_core_RWLock_return_code( - (CORE_RWLock_Status) _Thread_Executing->Wait.return_code + (CORE_RWLock_Status) executing->Wait.return_code ); #if defined(RTEMS_MULTIPROCESSING) |