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.

1 files changed, 79 insertions, 0 deletions

diff --git a/cpukit/libcsupport/src/malloc_statistics_helpers.c b/cpukit/libcsupport/src/malloc_statistics_helpers.c
new file mode 100644
index 0000000000..9e744a4c40
--- /dev/null
+++ b/cpukit/libcsupport/src/malloc_statistics_helpers.c
@@ -0,0 +1,79 @@
+
+/*
+ *  _calloc_r 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 <sys/reent.h>
+#include <stdlib.h>
+
+
+void rtems_malloc_statistics_initialize()
+{
+  /*
+   * Zero all the statistics
+   */
+  (void) memset(&rtems_malloc_statistics, 0, sizeof(rtems_malloc_statistics));
+}
+
+void rtems_malloc_statistics_at_malloc(
+  void *pointer
+)
+{
+  size_t     actual_size = 0;
+  uint32_t   current_depth;
+  rtems_malloc_statistics_t *s = &rtems_malloc_statistics;
+
+  if ( !pointer )
+    return;
+
+  _Protected_heap_Get_block_size(&RTEMS_Malloc_Heap, pointer, &actual_size);
+
+  MSBUMP(lifetime_allocated, actual_size);
+
+  current_depth = s->lifetime_allocated - s->lifetime_freed;
+  if (current_depth > s->max_depth)
+      s->max_depth = current_depth;
+}
+
+/*
+ *  If the pointer is not in the heap, then we won't be able to get its
+ *  size and thus we skip updating the statistics.
+ */
+void rtems_malloc_statistics_at_free(
+  void *pointer
+)
+{
+  size_t size;
+
+  if (_Protected_heap_Get_block_size(&RTEMS_Malloc_Heap, pointer, &size) ) {
+    MSBUMP(lifetime_freed, size);
+  }
+}
+
+rtems_malloc_statististics_functions_t rtems_malloc_statistics_helpers_table = {
+  rtems_malloc_statistics_initialize,
+  rtems_malloc_statistics_at_malloc,
+  rtems_malloc_statistics_at_free,
+};
+
+rtems_malloc_statististics_functions_t *rtems_malloc_statistics_helpers =
+  &rtems_malloc_statistics_helpers_table;
+
+#endif
+