Imagelibrary/rtems
1
0
Fork 1
mirror of https://gitlab.rtems.org/rtems/rtos/rtems.git synced 2025-12-26 14:18:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

2009-01-08 Joel Sherrill <joel.sherrill@OARcorp.com>

Browse Source 
* score/src/objectextendinformation.c: Fold two paths into one.
This commit is contained in:
Joel Sherrill
2009-01-08 15:01:52 +00:00
parent d326411469
commit d041e594e2
2 changed files with 11 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cpukit/ChangeLog
View File

@@ -1,3 +1,7 @@
2009-01-08 Joel Sherrill <joel.sherrill@OARcorp.com>
* score/src/objectextendinformation.c: Fold two paths into one.
2009-01-06 Ralf Corsépius <ralf.corsepius@rtems.org>
* rtems/src/barrier.c, rtems/src/barrierwait.c,

26
cpukit/score/src/objectextendinformation.c
View File

@@ -87,6 +87,7 @@ void _Objects_Extend_information(
Objects_Control **local_table;
uint32_t maximum;
void *old_tables;
size_t block_size;
/*
* Growing the tables means allocating a new area, doing a copy and
@@ -125,29 +126,16 @@ void _Objects_Extend_information(
* Allocate the tables and break it up.
*/
if ( information->auto_extend ) {
object_blocks = (void**)
_Workspace_Allocate(
block_count *
(sizeof(void *) + sizeof(uint32_t) + sizeof(Objects_Name *)) +
((maximum + minimum_index) * sizeof(Objects_Control *))
);
block_size = block_count *
(sizeof(void *) + sizeof(uint32_t) + sizeof(Objects_Name *)) +
((maximum + minimum_index) * sizeof(Objects_Control *));
object_blocks = (void**) _Workspace_Allocate( block_size );
if ( !object_blocks )
return;
}
else {
object_blocks = (void**)
_Workspace_Allocate_or_fatal_error(
block_count *
(sizeof(void *) + sizeof(uint32_t) + sizeof(Objects_Name *)) +
((maximum + minimum_index) * sizeof(Objects_Control *))
);
}
if ( !object_blocks )
return;
/*
* Break the block into the various sections.
*
*/
inactive_per_block = (uint32_t *) _Addresses_Add_offset(