From 543fe820616f31350366ab61052050303d17dd25 Mon Sep 17 00:00:00 2001 From: Joel Sherrill Date: Tue, 18 Dec 2007 20:36:40 +0000 Subject: 2007-12-18 Joel Sherrill * 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. --- .../src/malloc_report_statistics_plugin.c | 60 ++++++++++++++++++++++ 1 file changed, 60 insertions(+) create mode 100644 cpukit/libcsupport/src/malloc_report_statistics_plugin.c (limited to 'cpukit/libcsupport/src/malloc_report_statistics_plugin.c') diff --git a/cpukit/libcsupport/src/malloc_report_statistics_plugin.c b/cpukit/libcsupport/src/malloc_report_statistics_plugin.c new file mode 100644 index 0000000000..2f00477d44 --- /dev/null +++ b/cpukit/libcsupport/src/malloc_report_statistics_plugin.c @@ -0,0 +1,60 @@ +/* + * malloc_report_statistics with plugin Implementation + * + * COPYRIGHT (c) 1989-2007. + * On-Line Applications Research Corporation (OAR). + * + * The license and distribution terms for this file may be + * found in the file LICENSE in this distribution or at + * http://www.rtems.com/license/LICENSE. + * + * $Id$ + */ + +#if HAVE_CONFIG_H +#include "config.h" +#endif + +#ifdef RTEMS_NEWLIB +#include "malloc_p.h" +#include "inttypes.h" + +void malloc_report_statistics_with_plugin( + void *context, + rtems_printk_plugin_t print +) +{ + rtems_malloc_statistics_t *s; + uint32_t allocated; + + s = &rtems_malloc_statistics; + + allocated = s->lifetime_allocated - s->lifetime_freed; + + (*print)( + context, + "Malloc statistics\n" + " avail:%"PRIu32"k allocated:%"PRIu32"k (%"PRId32"%%) " + "max:%"PRIu32"k (%"PRIu32"%%)" + " lifetime:%"PRIuMAX"k freed:%"PRIuMAX"k\n", + s->space_available / 1024, + allocated / 1024, + /* avoid float! */ + (allocated * 100) / s->space_available, + s->max_depth / 1024, + (s->max_depth * 100) / s->space_available, + s->lifetime_allocated / 1024, + s->lifetime_freed / 1024 + ); + (*print)( + context, + " Call counts: malloc:%"PRIu32" free:%"PRIu32 + " realloc:%"PRIu32" calloc:%"PRIu32"\n", + s->malloc_calls, + s->free_calls, + s->realloc_calls, + s->calloc_calls + ); +} + +#endif -- cgit v1.2.3