RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

2010-01-19 Joel Sherrill <joel.sherrill@oarcorp.com>

Browse Source 
Coverity Id 5
	* score/src/objectinitializeinformation.c: Do not modify maximum
	parameter. Clean up and simplify code. This should help the Coverity
	path analysis to avoid reporting issues.
This commit is contained in:
Joel Sherrill
2010-01-19 19:33:08 +00:00
parent cb4e99201e
commit 2d2dcab250
2 changed files with 41 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cpukit/ChangeLog
View File

@@ -1,3 +1,10 @@
2010-01-19 Joel Sherrill <joel.sherrill@oarcorp.com>
Coverity Id 5
* score/src/objectinitializeinformation.c: Do not modify maximum
parameter. Clean up and simplify code. This should help the Coverity
path analysis to avoid reporting issues.
2010-01-19 Joel Sherrill <joel.sherrill@oarcorp.com> 2010-01-19 Joel Sherrill <joel.sherrill@oarcorp.com>
* libfs/src/imfs/imfs.h, libfs/src/imfs/imfs_creat.c, * libfs/src/imfs/imfs.h, libfs/src/imfs/imfs_creat.c,

89
cpukit/score/src/objectinitializeinformation.c
View File

@@ -1,8 +1,7 @@
/* /*
* Object Handler * Object Handler Initialization per Object Class
* *
* * COPYRIGHT (c) 1989-2010.
* COPYRIGHT (c) 1989-1999.
* On-Line Applications Research Corporation (OAR). * On-Line Applications Research Corporation (OAR).
* *
* The license and distribution terms for this file may be * The license and distribution terms for this file may be
@@ -65,68 +64,60 @@ void _Objects_Initialize_information(
static Objects_Control *null_local_table = NULL; static Objects_Control *null_local_table = NULL;
uint32_t minimum_index; uint32_t minimum_index;
uint32_t name_length; uint32_t name_length;
#if defined(RTEMS_MULTIPROCESSING) uint32_t maximum_per_allocation;
uint32_t index; #if defined(RTEMS_MULTIPROCESSING)
#endif uint32_t index;
#endif
information->the_api = the_api; information->the_api = the_api;
information->the_class = the_class; information->the_class = the_class;
#if defined(RTEMS_SCORE_OBJECT_ENABLE_STRING_NAMES) information->size = size;
information->is_string = is_string;
#endif
information->local_table = 0; information->local_table = 0;
information->inactive_per_block = 0; information->inactive_per_block = 0;
information->object_blocks = 0; information->object_blocks = 0;
information->inactive = 0; information->inactive = 0;
#if defined(RTEMS_SCORE_OBJECT_ENABLE_STRING_NAMES)
information->is_string = is_string;
#endif
/* /*
* Set the entry in the object information table. * Set the maximum value to 0. It will be updated when objects are
* added to the inactive set from _Objects_Extend_information()
*/ */
information->maximum = 0;
/*
* Register this Object Class in the Object Information Table.
*/
_Objects_Information_table[ the_api ][ the_class ] = information; _Objects_Information_table[ the_api ][ the_class ] = information;
/* /*
* Set the size of the object * Are we operating in limited or unlimited (e.g. auto-extend) mode.
*/ */
information->size = size;
/*
* Are we operating in unlimited, or auto-extend mode
*/
information->auto_extend = information->auto_extend =
(maximum & OBJECTS_UNLIMITED_OBJECTS) ? true : false; (maximum & OBJECTS_UNLIMITED_OBJECTS) ? true : false;
maximum &= ~OBJECTS_UNLIMITED_OBJECTS; maximum_per_allocation = maximum & ~OBJECTS_UNLIMITED_OBJECTS;
/* /*
* The allocation unit is the maximum value * The allocation unit is the maximum value
*/ */
information->allocation_size = maximum_per_allocation;
information->allocation_size = maximum;
/* /*
* Provide a null local table entry for the case of any empty table. * Provide a null local table entry for the case of any empty table.
*/ */
information->local_table = &null_local_table; information->local_table = &null_local_table;
/* /*
* Calculate minimum and maximum Id's * Calculate minimum and maximum Id's
*/ */
minimum_index = (maximum_per_allocation == 0) ? 0 : 1;
if ( maximum == 0 ) minimum_index = 0;
else minimum_index = 1;
information->minimum_id = information->minimum_id =
_Objects_Build_id( the_api, the_class, _Objects_Local_node, minimum_index ); _Objects_Build_id( the_api, the_class, _Objects_Local_node, minimum_index );
/* /*
* Calculate the maximum name length * Calculate the maximum name length
*/ */
name_length = maximum_name_length; name_length = maximum_name_length;
if ( name_length & (OBJECTS_NAME_ALIGNMENT-1) ) if ( name_length & (OBJECTS_NAME_ALIGNMENT-1) )
@@ -140,44 +131,32 @@ void _Objects_Initialize_information(
/* /*
* Initialize objects .. if there are any * Initialize objects .. if there are any
*/ */
if ( maximum_per_allocation ) {
if ( maximum ) {
/*
* Reset the maximum value. It will be updated when the information is
* extended.
*/
information->maximum = 0;
/* /*
* Always have the maximum size available so the current performance * Always have the maximum size available so the current performance
* figures are create are met. If the user moves past the maximum * figures are create are met. If the user moves past the maximum
* number then a performance hit is taken. * number then a performance hit is taken.
*/ */
_Objects_Extend_information( information ); _Objects_Extend_information( information );
} }
/* /*
* Take care of multiprocessing * Take care of multiprocessing
*/ */
#if defined(RTEMS_MULTIPROCESSING)
information->extract = extract;
#if defined(RTEMS_MULTIPROCESSING) if ( (supports_global == true) && _System_state_Is_multiprocessing ) {
information->extract = extract;
if ( (supports_global == true) && _System_state_Is_multiprocessing ) { information->global_table =
(Chain_Control *) _Workspace_Allocate_or_fatal_error(
(_Objects_Maximum_nodes + 1) * sizeof(Chain_Control)
);
information->global_table = for ( index=1; index <= _Objects_Maximum_nodes ; index++ )
(Chain_Control *) _Workspace_Allocate_or_fatal_error( _Chain_Initialize_empty( &information->global_table[ index ] );
(_Objects_Maximum_nodes + 1) * sizeof(Chain_Control) }
); else
information->global_table = NULL;
for ( index=1; index <= _Objects_Maximum_nodes ; index++ ) #endif
_Chain_Initialize_empty( &information->global_table[ index ] );
}
else
information->global_table = NULL;
#endif
} }