diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2009-03-02 18:10:34 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2009-03-02 18:10:34 +0000 |
| commit | 7246c8e9978e63058a688db708d8235f841a8d80 (patch) | |
| tree | 58a8e68e1f6949d24820bd4a30297b356af2b517 /cpukit/libcsupport/src/malloc_initialize.c | |
| parent | 2009-03-02 Joel Sherrill <joel.sherrill@OARcorp.com> (diff) | |
| download | rtems-7246c8e9978e63058a688db708d8235f841a8d80.tar.bz2 | |
2009-03-02 Joel Sherrill <joel.sherrill@oarcorp.com>
* libcsupport/src/malloc_initialize.c, score/Makefile.am,
score/include/rtems/score/protectedheap.h,
score/inline/rtems/score/heap.inl: Get total heap size correct when
using unified C Program Heap and RTEMS Workspace.
* score/src/pheapgetsize.c: New file.
Diffstat (limited to 'cpukit/libcsupport/src/malloc_initialize.c')
| -rw-r--r-- | cpukit/libcsupport/src/malloc_initialize.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/cpukit/libcsupport/src/malloc_initialize.c b/cpukit/libcsupport/src/malloc_initialize.c index 1105724a67..eb477b23ca 100644 --- a/cpukit/libcsupport/src/malloc_initialize.c +++ b/cpukit/libcsupport/src/malloc_initialize.c @@ -101,8 +101,11 @@ void RTEMS_Malloc_Initialize( ); if ( !status ) rtems_fatal_error_occurred( status ); + } + MSBUMP( space_available, _Protected_heap_Get_size(RTEMS_Malloc_Heap->final) ); + #if defined(RTEMS_HEAP_DEBUG) if ( _Protected_heap_Walk( RTEMS_Malloc_Heap, 0, false ) ) { printk( "Malloc heap not initialized correctly\n" ); @@ -112,6 +115,4 @@ void RTEMS_Malloc_Initialize( rtems_fatal_error_occurred( RTEMS_NO_MEMORY ); } #endif - - MSBUMP(space_available, length); } |