diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2007-11-06 21:40:01 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2007-11-06 21:40:01 +0000 |
| commit | 3dbaf975824caceb465397d74fe708a61ca9cf74 (patch) | |
| tree | 49e899e2242bf329b3b706fb21bccbf137a2b760 | |
| parent | 2007-11-06 Joel Sherrill <joel.sherrill@OARcorp.com> (diff) | |
| download | rtems-3dbaf975824caceb465397d74fe708a61ca9cf74.tar.bz2 | |
2007-11-06 Joel Sherrill <joel.sherrill@OARcorp.com>
PR 1266/cpukit
* posix/src/keycreate.c, posix/src/keyrundestructors.c: Use API instead
of class for key indexing.
| -rw-r--r-- | cpukit/ChangeLog | 6 | ||||
| -rw-r--r-- | cpukit/posix/src/keycreate.c | 2 | ||||
| -rw-r--r-- | cpukit/posix/src/keyrundestructors.c | 12 |
3 files changed, 13 insertions, 7 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index a1f10922d2..1a547ce525 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,5 +1,11 @@ 2007-11-06 Joel Sherrill <joel.sherrill@OARcorp.com> + PR 1266/cpukit + * posix/src/keycreate.c, posix/src/keyrundestructors.c: Use API instead + of class for key indexing. + +2007-11-06 Joel Sherrill <joel.sherrill@OARcorp.com> + * libmisc/cpuuse/cpuuse.c: Fix date formatting. 2007-09-14 Joel Sherrill <joel.sherrill@OARcorp.com> diff --git a/cpukit/posix/src/keycreate.c b/cpukit/posix/src/keycreate.c index d8ae746992..fbf84101e0 100644 --- a/cpukit/posix/src/keycreate.c +++ b/cpukit/posix/src/keycreate.c @@ -46,7 +46,7 @@ int pthread_key_create( /* * This is a bit more complex than one might initially expect because * APIs are optional. Thus there may be no ITRON tasks to have keys - * for. [NOTE: Currently RTEMS Classic API tasks are not always enabled.] + * for. [NOTE: Currently RTEMS Classic API tasks are always enabled.] */ for ( the_api = 1; diff --git a/cpukit/posix/src/keyrundestructors.c b/cpukit/posix/src/keyrundestructors.c index f2c3b8e380..299a37eeee 100644 --- a/cpukit/posix/src/keyrundestructors.c +++ b/cpukit/posix/src/keyrundestructors.c @@ -31,15 +31,15 @@ void _POSIX_Keys_Run_destructors( ) { uint32_t index; - uint32_t pthread_index; - uint32_t pthread_class; + uint32_t thread_index; + uint32_t thread_api; uint32_t iterations; boolean are_all_null; POSIX_Keys_Control *the_key; void *value; - pthread_index = _Objects_Get_index( thread->Object.id ); - pthread_class = _Objects_Get_class( thread->Object.id ); + thread_index = _Objects_Get_index( thread->Object.id ); + thread_api = _Objects_Get_API( thread->Object.id ); iterations = 0; @@ -53,10 +53,10 @@ void _POSIX_Keys_Run_destructors( _POSIX_Keys_Information.local_table[ index ]; if ( the_key && the_key->is_active && the_key->destructor ) { - value = the_key->Values[ pthread_class ][ pthread_index ]; + value = the_key->Values[ thread_api ][ thread_index ]; if ( value ) { (*the_key->destructor)( value ); - if ( the_key->Values[ pthread_class ][ pthread_index ] ) + if ( the_key->Values[ thread_api ][ thread_index ] ) are_all_null = FALSE; } } |