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 | |
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')
-rw-r--r-- | cpukit/posix/src/prwlockrdlock.c | 15 | ||||
-rw-r--r-- | cpukit/posix/src/prwlocktimedrdlock.c | 27 | ||||
-rw-r--r-- | cpukit/posix/src/prwlocktimedwrlock.c | 27 | ||||
-rw-r--r-- | cpukit/posix/src/prwlocktryrdlock.c | 15 | ||||
-rw-r--r-- | cpukit/posix/src/prwlocktrywrlock.c | 15 | ||||
-rw-r--r-- | cpukit/posix/src/prwlockunlock.c | 2 | ||||
-rw-r--r-- | cpukit/posix/src/prwlockwrlock.c | 15 |
7 files changed, 67 insertions, 49 deletions
diff --git a/cpukit/posix/src/prwlockrdlock.c b/cpukit/posix/src/prwlockrdlock.c index 3d4d76fab7..e045b07679 100644 --- a/cpukit/posix/src/prwlockrdlock.c +++ b/cpukit/posix/src/prwlockrdlock.c @@ -39,6 +39,7 @@ int pthread_rwlock_rdlock( { POSIX_RWLock_Control *the_rwlock; Objects_Locations location; + Thread_Control *executing; if ( !rwlock ) return EINVAL; @@ -48,17 +49,19 @@ int pthread_rwlock_rdlock( case OBJECTS_LOCAL: + executing = _Thread_Executing; _CORE_RWLock_Obtain_for_reading( - &the_rwlock->RWLock, - *rwlock, - true, /* we are willing to wait forever */ - 0, - NULL + &the_rwlock->RWLock, + executing, + *rwlock, + true, /* we are willing to wait forever */ + 0, + NULL ); _Objects_Put( &the_rwlock->Object ); 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) diff --git a/cpukit/posix/src/prwlocktimedrdlock.c b/cpukit/posix/src/prwlocktimedrdlock.c index 29e1c1b4f9..6aec5f3873 100644 --- a/cpukit/posix/src/prwlocktimedrdlock.c +++ b/cpukit/posix/src/prwlocktimedrdlock.c @@ -48,6 +48,7 @@ int pthread_rwlock_timedrdlock( Watchdog_Interval ticks; bool do_wait = true; POSIX_Absolute_timeout_conversion_results_t status; + Thread_Control *executing; if ( !rwlock ) return EINVAL; @@ -74,27 +75,29 @@ int pthread_rwlock_timedrdlock( case OBJECTS_LOCAL: + executing = _Thread_Executing; _CORE_RWLock_Obtain_for_reading( - &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 ) { - if ( _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; + if ( 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) 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) diff --git a/cpukit/posix/src/prwlocktryrdlock.c b/cpukit/posix/src/prwlocktryrdlock.c index c4cfd76108..d682802784 100644 --- a/cpukit/posix/src/prwlocktryrdlock.c +++ b/cpukit/posix/src/prwlocktryrdlock.c @@ -43,6 +43,7 @@ int pthread_rwlock_tryrdlock( { POSIX_RWLock_Control *the_rwlock; Objects_Locations location; + Thread_Control *executing; if ( !rwlock ) return EINVAL; @@ -52,18 +53,20 @@ int pthread_rwlock_tryrdlock( case OBJECTS_LOCAL: + executing = _Thread_Executing; _CORE_RWLock_Obtain_for_reading( - &the_rwlock->RWLock, - *rwlock, - false, /* do not wait for the rwlock */ - 0, - NULL + &the_rwlock->RWLock, + executing, + *rwlock, + false, /* do not wait for the rwlock */ + 0, + NULL ); _Objects_Put( &the_rwlock->Object ); 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) diff --git a/cpukit/posix/src/prwlocktrywrlock.c b/cpukit/posix/src/prwlocktrywrlock.c index 23259db34a..189983632c 100644 --- a/cpukit/posix/src/prwlocktrywrlock.c +++ b/cpukit/posix/src/prwlocktrywrlock.c @@ -43,6 +43,7 @@ int pthread_rwlock_trywrlock( { POSIX_RWLock_Control *the_rwlock; Objects_Locations location; + Thread_Control *executing; if ( !rwlock ) return EINVAL; @@ -52,17 +53,19 @@ int pthread_rwlock_trywrlock( case OBJECTS_LOCAL: + executing = _Thread_Executing; _CORE_RWLock_Obtain_for_writing( - &the_rwlock->RWLock, - *rwlock, - false, /* we are not willing to wait */ - 0, - NULL + &the_rwlock->RWLock, + executing, + *rwlock, + false, /* we are not willing to wait */ + 0, + NULL ); _Objects_Put( &the_rwlock->Object ); 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) diff --git a/cpukit/posix/src/prwlockunlock.c b/cpukit/posix/src/prwlockunlock.c index 13fc6dcc57..b7cd360464 100644 --- a/cpukit/posix/src/prwlockunlock.c +++ b/cpukit/posix/src/prwlockunlock.c @@ -54,7 +54,7 @@ int pthread_rwlock_unlock( switch ( location ) { case OBJECTS_LOCAL: - status = _CORE_RWLock_Release( &the_rwlock->RWLock ); + status = _CORE_RWLock_Release( &the_rwlock->RWLock, _Thread_Executing ); _Objects_Put( &the_rwlock->Object ); return _POSIX_RWLock_Translate_core_RWLock_return_code( status ); diff --git a/cpukit/posix/src/prwlockwrlock.c b/cpukit/posix/src/prwlockwrlock.c index b53a7e0a61..799fb7ae7e 100644 --- a/cpukit/posix/src/prwlockwrlock.c +++ b/cpukit/posix/src/prwlockwrlock.c @@ -45,6 +45,7 @@ int pthread_rwlock_wrlock( { POSIX_RWLock_Control *the_rwlock; Objects_Locations location; + Thread_Control *executing; if ( !rwlock ) return EINVAL; @@ -54,17 +55,19 @@ int pthread_rwlock_wrlock( case OBJECTS_LOCAL: + executing = _Thread_Executing; _CORE_RWLock_Obtain_for_writing( - &the_rwlock->RWLock, - *rwlock, - true, /* do not timeout -- wait forever */ - 0, - NULL + &the_rwlock->RWLock, + executing, + *rwlock, + true, /* do not timeout -- wait forever */ + 0, + NULL ); _Objects_Put( &the_rwlock->Object ); 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) |