diff options
author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2007-12-18 20:36:40 +0000 |
---|---|---|
committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2007-12-18 20:36:40 +0000 |
commit | 543fe820616f31350366ab61052050303d17dd25 (patch) | |
tree | a2e4702be2cd9988ed341586c1c8c976b8ba3bb8 /cpukit/libmisc/shell/main_mallocinfo.c | |
parent | 2007-12-18 Joel Sherrill <joel.sherrill@OARcorp.com> (diff) | |
download | rtems-543fe820616f31350366ab61052050303d17dd25.tar.bz2 |
2007-12-18 Joel Sherrill <joel.sherrill@oarcorp.com>
* libcsupport/Makefile.am, libcsupport/preinstall.am,
libcsupport/src/malloc.c, libcsupport/src/mallocinfo.c,
libmisc/Makefile.am, libmisc/shell/main_mallocinfo.c,
libmisc/shell/shellconfig.h: Split malloc.c into multiple files with
one function per file. Also split out statistics into a separate file
which can be plugged in dynamically. Right now, it is always in. I
suspect that splitting the file removed more code than leaving
statistics in. I tinkered with malloc information command in the
shell. I resurrected the malloc arena code as malloc boundary. This
code is now compiled all the time even though it does not appear to
work.
* libcsupport/include/rtems/malloc.h, libcsupport/src/_calloc_r.c,
libcsupport/src/_free_r.c, libcsupport/src/_malloc_r.c,
libcsupport/src/_realloc_r.c, libcsupport/src/calloc.c,
libcsupport/src/free.c, libcsupport/src/malloc_boundary.c,
libcsupport/src/malloc_get_statistics.c,
libcsupport/src/malloc_initialize.c, libcsupport/src/malloc_p.h,
libcsupport/src/malloc_report_statistics.c,
libcsupport/src/malloc_report_statistics_plugin.c,
libcsupport/src/malloc_statistics_helpers.c,
libcsupport/src/malloc_walk.c, libcsupport/src/realloc.c,
libmisc/shell/main_perioduse.c: New files.
Diffstat (limited to 'cpukit/libmisc/shell/main_mallocinfo.c')
-rw-r--r-- | cpukit/libmisc/shell/main_mallocinfo.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/cpukit/libmisc/shell/main_mallocinfo.c b/cpukit/libmisc/shell/main_mallocinfo.c index 689a022073..fa3c239ba4 100644 --- a/cpukit/libmisc/shell/main_mallocinfo.c +++ b/cpukit/libmisc/shell/main_mallocinfo.c @@ -18,6 +18,7 @@ #include <inttypes.h> #include <rtems.h> +#include <rtems/malloc.h> #include <rtems/shell.h> #include "internal.h" @@ -39,8 +40,8 @@ static void printit( } int rtems_shell_main_malloc_info( - int argc, - char * argv[] + int argc, + char *argv[] ) { if ( argc == 2 ) { @@ -51,19 +52,21 @@ int rtems_shell_main_malloc_info( printit( "free", &info.Free ); printit( "used", &info.Used ); return 0; - } else if ( !strcmp( argv[1], "dump" ) ) { - extern void malloc_dump(); - malloc_dump(); + } else if ( !strcmp( argv[1], "stats" ) ) { + malloc_report_statistics_with_plugin( + stdout, + (rtems_printk_plugin_t) fprintf + ); return 0; } } - fprintf( stderr, "subcommands info or dump\n" ); + fprintf( stderr, "subcommands info or stats\n" ); return -1; } rtems_shell_cmd_t rtems_shell_MALLOC_INFO_Command = { "malloc", /* name */ - "[info|dump]", /* usage */ + "[info|stats]", /* usage */ "mem", /* topic */ rtems_shell_main_malloc_info, /* command */ NULL, /* alias */ |