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

score: Fix unlimited objects support

Browse Source 
Commit 21275b58a5 ("score: Static
Objects_Information initialization") introduced an off-by-one error in the
maintenance of inactive objects.

Close #4676.
This commit is contained in:
Sebastian Huber
2022-07-13 14:42:43 +02:00
parent fc7584d719
commit b9de5b3bd6
2 changed files with 32 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
cpukit/include/rtems/score/objectimpl.h
View File

@@ -937,6 +937,25 @@ RTEMS_INLINE_ROUTINE void _Objects_Free(
( *information->deallocate )( information, the_object ); ( *information->deallocate )( information, the_object );
} }
/**
* @brief Returns true, if the object associated with the zero-based index is
* contained in an allocated block of objects, otherwise false.
*
* @param index is the zero-based object index.
* @param objects_per_block is the object count per block.
*
* @retval true The object associated with the zero-based index is in an
* allocated block of objects.
* @retval false Otherwise.
*/
RTEMS_INLINE_ROUTINE bool _Objects_Is_in_allocated_block(
Objects_Maximum index,
Objects_Maximum objects_per_block
)
{
return index >= objects_per_block;
}
/** /**
* @brief Activate the object. * @brief Activate the object.
* *
@@ -952,15 +971,17 @@ RTEMS_INLINE_ROUTINE void _Objects_Activate_unlimited(
) )
{ {
Objects_Maximum objects_per_block; Objects_Maximum objects_per_block;
Objects_Maximum block; Objects_Maximum index;
_Assert( _Objects_Is_auto_extend( information ) ); _Assert( _Objects_Is_auto_extend( information ) );
objects_per_block = information->objects_per_block; objects_per_block = information->objects_per_block;
block = _Objects_Get_index( the_object->id ) - OBJECTS_INDEX_MINIMUM; index = _Objects_Get_index( the_object->id ) - OBJECTS_INDEX_MINIMUM;
if ( block > objects_per_block ) { if ( _Objects_Is_in_allocated_block( index, objects_per_block ) ) {
block /= objects_per_block; Objects_Maximum block;
block = index / objects_per_block;
information->inactive_per_block[ block ]--; information->inactive_per_block[ block ]--;
information->inactive--; information->inactive--;

12
cpukit/score/src/objectfree.c
View File

@@ -30,14 +30,16 @@ void _Objects_Free_unlimited(
if ( _Objects_Is_auto_extend( information ) ) { if ( _Objects_Is_auto_extend( information ) ) {
Objects_Maximum objects_per_block; Objects_Maximum objects_per_block;
Objects_Maximum block; Objects_Maximum index;
Objects_Maximum inactive;
objects_per_block = information->objects_per_block; objects_per_block = information->objects_per_block;
block = _Objects_Get_index( the_object->id ) - OBJECTS_INDEX_MINIMUM; index = _Objects_Get_index( the_object->id ) - OBJECTS_INDEX_MINIMUM;
if ( block > objects_per_block ) { if ( _Objects_Is_in_allocated_block( index, objects_per_block ) ) {
block /= objects_per_block; Objects_Maximum block;
Objects_Maximum inactive;
block = index / objects_per_block;
++information->inactive_per_block[ block ]; ++information->inactive_per_block[ block ];