Mirrors_Framework/rtems
1
0
Fork 0
mirror of https://gitlab.rtems.org/rtems/rtos/rtems.git synced 2026-09-27 16:19:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* score/inline/rtems/score/heap.inl, score/src/heapresizeblock.c:
	Simplify routine.
This commit is contained in:
Joel Sherrill
2009-08-01 18:18:26 +00:00
parent 709ac26394
commit fb29a8de4a
3 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cpukit/ChangeLog
+5
View File
@@ -1,3 +1,8 @@
2009-08-01 Joel Sherrill <joel.sherrill@OARcorp.com>
* score/inline/rtems/score/heap.inl, score/src/heapresizeblock.c:
Simplify routine.
2009-08-01 Joel Sherrill <joel.sherrill@oarcorp.com> 2009-08-01 Joel Sherrill <joel.sherrill@oarcorp.com>
* score/inline/rtems/score/heap.inl, score/src/heapwalk.c: Do not * score/inline/rtems/score/heap.inl, score/src/heapwalk.c: Do not
cpukit/score/inline/rtems/score/heap.inl
+6 -3
View File
@@ -238,10 +238,13 @@ RTEMS_INLINE_ROUTINE void _Heap_Align_up_uptr (
uint32_t alignment uint32_t alignment
) )
{ {
_H_uptr_t remainder;
_H_uptr_t v = *value; _H_uptr_t v = *value;
uint32_t a = alignment;
_H_uptr_t r = v % a; remainder = v % alignment;
*value = r ? v - r + a : v;
if ( remainder )
*value = v - remainder + alignment;
} }
/** /**
cpukit/score/src/heapresizeblock.c
+5
View File
@@ -117,6 +117,7 @@ Heap_Resize_status _Heap_Resize_block(
uint32_t free_block_size = old_user_size - size; uint32_t free_block_size = old_user_size - size;
_Heap_Align_down(&free_block_size, page_size); _Heap_Align_down(&free_block_size, page_size);
printk( "free=%d\n", free_block_size );
if (free_block_size > 0) { if (free_block_size > 0) {
/* To free some memory the block should be shortened so that it can /* To free some memory the block should be shortened so that it can
@@ -125,6 +126,8 @@ Heap_Resize_status _Heap_Resize_block(
uint32_t new_block_size = old_block_size - free_block_size; uint32_t new_block_size = old_block_size - free_block_size;
printk( "new=%d min=%d hit=%s\n", new_block_size, min_block_size,
((new_block_size < min_block_size) ? "yes" : "no") );
if (new_block_size < min_block_size) { if (new_block_size < min_block_size) {
uint32_t delta = min_block_size - new_block_size; uint32_t delta = min_block_size - new_block_size;
_HAssert(free_block_size >= delta); _HAssert(free_block_size >= delta);
@@ -141,6 +144,8 @@ Heap_Resize_status _Heap_Resize_block(
_HAssert(_Heap_Is_aligned(new_block_size, page_size)); _HAssert(_Heap_Is_aligned(new_block_size, page_size));
_HAssert(_Heap_Is_aligned(free_block_size, page_size)); _HAssert(_Heap_Is_aligned(free_block_size, page_size));
printk( "next_is_used=%d free=%d min=%d hit=%s\n", next_is_used, free_block_size, min_block_size,
((next_is_used) && (free_block_size <= min_block_size) ? "yes" : "no") );
if (!next_is_used) { if (!next_is_used) {
/* Extend the next block to the low addresses by 'free_block_size' */ /* Extend the next block to the low addresses by 'free_block_size' */
Heap_Block *const new_next_block = Heap_Block *const new_next_block =