diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2008-09-19 16:15:21 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2008-09-19 16:15:21 +0000 |
| commit | af70ed5b1912d18745a4b02444013957201e2cac (patch) | |
| tree | cb9104715916308dc83eeba3dab285bfd6bdba57 | |
| parent | 2008-09-19 Joel Sherrill <joel.sherrill@oarcorp.com> (diff) | |
| download | rtems-af70ed5b1912d18745a4b02444013957201e2cac.tar.bz2 | |
2008-09-19 Joel Sherrill <joel.sherrill@oarcorp.com>
* libmisc/shell/main_mallocinfo.c, libmisc/shell/main_wkspaceinfo.c:
Include information on whether C Program Heap and RTEMS Workspace are
separate.
| -rw-r--r-- | cpukit/ChangeLog | 6 | ||||
| -rw-r--r-- | cpukit/libmisc/shell/main_mallocinfo.c | 3 | ||||
| -rw-r--r-- | cpukit/libmisc/shell/main_wkspaceinfo.c | 11 |
3 files changed, 20 insertions, 0 deletions
diff --git a/cpukit/ChangeLog b/cpukit/ChangeLog index ed3feb7068..5d5eb347ac 100644 --- a/cpukit/ChangeLog +++ b/cpukit/ChangeLog @@ -1,3 +1,9 @@ +2008-09-19 Joel Sherrill <joel.sherrill@oarcorp.com> + + * libmisc/shell/main_mallocinfo.c, libmisc/shell/main_wkspaceinfo.c: + Include information on whether C Program Heap and RTEMS Workspace are + separate. + 2008-09-18 Joel Sherrill <joel.sherrill@oarcorp.com> * libfs/Makefile.am: Do not build nfsclient if no networking. diff --git a/cpukit/libmisc/shell/main_mallocinfo.c b/cpukit/libmisc/shell/main_mallocinfo.c index 109dbc3dd3..12423c7a73 100644 --- a/cpukit/libmisc/shell/main_mallocinfo.c +++ b/cpukit/libmisc/shell/main_mallocinfo.c @@ -23,6 +23,7 @@ #include "internal.h" extern int malloc_info( region_information_block * ); +extern void rtems_shell_print_unified_work_area_message(void); int rtems_shell_main_malloc_info( int argc, @@ -30,6 +31,8 @@ int rtems_shell_main_malloc_info( ) { if ( argc == 2 ) { + rtems_shell_print_unified_work_area_message(); + if ( !strcmp( argv[1], "info" ) ) { region_information_block info; diff --git a/cpukit/libmisc/shell/main_wkspaceinfo.c b/cpukit/libmisc/shell/main_wkspaceinfo.c index 7c1f8a0c37..9eb26900d5 100644 --- a/cpukit/libmisc/shell/main_wkspaceinfo.c +++ b/cpukit/libmisc/shell/main_wkspaceinfo.c @@ -24,6 +24,15 @@ #include <rtems/score/protectedheap.h> #include "internal.h" +extern bool rtems_unified_work_area; + +void rtems_shell_print_unified_work_area_message(void) +{ + printf( "\nC Program Heap and RTEMS Workspace are %s.\n", + ((rtems_unified_work_area) ? "the same" : "separate") + ); +} + int rtems_shell_main_wkspace_info( int argc, char *argv[] @@ -31,6 +40,8 @@ int rtems_shell_main_wkspace_info( { Heap_Information_block info; + rtems_shell_print_unified_work_area_message(); + _Protected_heap_Get_information( &_Workspace_Area, &info ); rtems_shell_print_heap_info( "free", &info.Free ); rtems_shell_print_heap_info( "used", &info.Used ); |