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

score: Add _Objects_Free_objects_block()

Browse Source 
This is a preparation to allow a customization of the objects
information extend.

Update #3835.
This commit is contained in:
Sebastian Huber
2019-12-10 10:04:36 +01:00
parent 32991495b4
commit 6f3bc0e320
2 changed files with 64 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -94,6 +94,17 @@ void _Objects_Extend_information(
Objects_Information *information
);
/**
* @brief Free the objects block with the specified index.
*
* @param information The objects information.
* @param block The block index.
*/
void _Objects_Free_objects_block(
Objects_Information *information,
Objects_Maximum block
);
/**
* @brief Shrinks an object class information record.
*

92
cpukit/score/src/objectshrinkinformation.c
View File

@@ -22,6 +22,58 @@
#include <rtems/score/chainimpl.h>
#include <rtems/score/wkspace.h>
void _Objects_Free_objects_block(
Objects_Information *information,
Objects_Maximum block
)
{
Objects_Maximum objects_per_block;
Objects_Maximum index_base;
Objects_Maximum index_end;
Chain_Node *node;
const Chain_Node *tail;
objects_per_block = information->objects_per_block;
_Assert( _Objects_Allocator_is_owner() );
_Assert( _Objects_Is_auto_extend( information ) );
_Assert( block >= 1 );
_Assert(
block < _Objects_Get_maximum_index( information ) / objects_per_block
);
index_base = block * objects_per_block;
index_end = index_base + objects_per_block;
node = _Chain_First( &information->Inactive );
tail = _Chain_Immutable_tail( &information->Inactive );
while ( node != tail ) {
Objects_Control *object;
uint32_t index;
object = (Objects_Control *) node;
index = _Objects_Get_index( object->id ) - OBJECTS_INDEX_MINIMUM;
/*
* Get the next node before the node is extracted
*/
node = _Chain_Next( node );
if ( index >= index_base && index < index_end ) {
_Chain_Extract_unprotected( &object->Node );
}
}
/*
* Free the memory and reset the structures in the object' information
*/
_Workspace_Free( information->object_blocks[ block ] );
information->object_blocks[ block ] = NULL;
information->inactive_per_block[ block ] = 0;
information->inactive -= objects_per_block;
}
void _Objects_Shrink_information(
Objects_Information *information
)
@@ -29,7 +81,6 @@ void _Objects_Shrink_information(
Objects_Maximum objects_per_block;
Objects_Maximum block_count;
Objects_Maximum block;
Objects_Maximum index_base;
_Assert( _Objects_Allocator_is_owner() );
_Assert( _Objects_Is_auto_extend( information ) );
@@ -40,48 +91,11 @@ void _Objects_Shrink_information(
objects_per_block = information->objects_per_block;
block_count = _Objects_Get_maximum_index( information ) / objects_per_block;
index_base = objects_per_block;
for ( block = 1; block < block_count; block++ ) {
if ( information->inactive_per_block[ block ] == objects_per_block ) {
Chain_Node *node;
const Chain_Node *tail;
Objects_Maximum index_end;
node = _Chain_First( &information->Inactive );
tail = _Chain_Immutable_tail( &information->Inactive );
index_end = index_base + objects_per_block;
while ( node != tail ) {
Objects_Control *object;
uint32_t index;
object = (Objects_Control *) node;
index = _Objects_Get_index( object->id ) - OBJECTS_INDEX_MINIMUM;
/*
* Get the next node before the node is extracted
*/
node = _Chain_Next( node );
if ( index >= index_base && index < index_end ) {
_Chain_Extract_unprotected( &object->Node );
}
}
/*
* Free the memory and reset the structures in the object' information
*/
_Workspace_Free( information->object_blocks[ block ] );
information->object_blocks[ block ] = NULL;
information->inactive_per_block[ block ] = 0;
information->inactive -= objects_per_block;
_Objects_Free_objects_block( information, block );
return;
}
index_base += objects_per_block;
}
}