diff options
| author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2018-11-22 06:16:52 +0100 |
|---|---|---|
| committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2018-12-07 14:22:01 +0100 |
| commit | 0da9d805cd697dd2eed050374f704b29e8d3c18a (patch) | |
| tree | 16031d8637dbc21e1927354049c9ab581caafae4 /cpukit/score | |
| parent | score: Remove Objects_Information::is_string (diff) | |
| download | rtems-0da9d805cd697dd2eed050374f704b29e8d3c18a.tar.bz2 | |
score: Rename Objects_Information::size
Rename Objects_Information::size to Objects_Information::object_size.
Change its type from size_t to uint16_t and move it to reduce the size
of Objects_Information.
Update #3621.
Diffstat (limited to 'cpukit/score')
| -rw-r--r-- | cpukit/score/src/objectallocate.c | 2 | ||||
| -rw-r--r-- | cpukit/score/src/objectextendinformation.c | 4 | ||||
| -rw-r--r-- | cpukit/score/src/objectinitializeinformation.c | 4 | ||||
| -rw-r--r-- | cpukit/score/src/threadinitialize.c | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/cpukit/score/src/objectallocate.c b/cpukit/score/src/objectallocate.c index e09c74c70c..97ced4bdf5 100644 --- a/cpukit/score/src/objectallocate.c +++ b/cpukit/score/src/objectallocate.c @@ -47,7 +47,7 @@ Objects_Control *_Objects_Allocate_unprotected( * should be all zeroed out because it is in the BSS. So let's * check that code for this manager is even present. */ - if ( information->size == 0 ) + if ( information->object_size == 0 ) return NULL; /* diff --git a/cpukit/score/src/objectextendinformation.c b/cpukit/score/src/objectextendinformation.c index d2ee7fdf8b..3fc9cdd464 100644 --- a/cpukit/score/src/objectextendinformation.c +++ b/cpukit/score/src/objectextendinformation.c @@ -100,7 +100,7 @@ void _Objects_Extend_information( * Allocate the name table, and the objects and if it fails either return or * generate a fatal error depending on auto-extending being active. */ - object_block_size = information->allocation_size * information->size; + object_block_size = information->allocation_size * information->object_size; if ( information->auto_extend ) { new_object_block = _Workspace_Allocate( object_block_size ); if ( !new_object_block ) @@ -261,6 +261,6 @@ void _Objects_Extend_information( _Chain_Initialize_node( &the_object->Node ); _Chain_Append_unprotected( &information->Inactive, &the_object->Node ); - the_object = _Addresses_Add_offset( the_object, information->size ); + the_object = _Addresses_Add_offset( the_object, information->object_size ); } } diff --git a/cpukit/score/src/objectinitializeinformation.c b/cpukit/score/src/objectinitializeinformation.c index 2105c325d3..90f50d544c 100644 --- a/cpukit/score/src/objectinitializeinformation.c +++ b/cpukit/score/src/objectinitializeinformation.c @@ -29,7 +29,7 @@ void _Objects_Do_initialize_information( Objects_APIs the_api, uint16_t the_class, uint32_t maximum, - uint16_t size, + uint16_t object_size, uint16_t maximum_name_length #if defined(RTEMS_MULTIPROCESSING) , @@ -43,7 +43,7 @@ void _Objects_Do_initialize_information( information->the_api = the_api; information->the_class = the_class; - information->size = size; + information->object_size = object_size; information->local_table = 0; information->inactive_per_block = 0; information->object_blocks = 0; diff --git a/cpukit/score/src/threadinitialize.c b/cpukit/score/src/threadinitialize.c index 401973ec9b..df526e9a8e 100644 --- a/cpukit/score/src/threadinitialize.c +++ b/cpukit/score/src/threadinitialize.c @@ -73,7 +73,7 @@ bool _Thread_Initialize( memset( &the_thread->Join_queue, 0, - information->Objects.size - offsetof( Thread_Control, Join_queue ) + information->Objects.object_size - offsetof( Thread_Control, Join_queue ) ); for ( i = 0 ; i < _Thread_Control_add_on_count ; ++i ) { |