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, 103 insertions, 0 deletions

diff --git a/cpukit/libcsupport/src/realloc.c b/cpukit/libcsupport/src/realloc.c
new file mode 100644
index 0000000000..cba244cc37
--- /dev/null
+++ b/cpukit/libcsupport/src/realloc.c
@@ -0,0 +1,103 @@
+/*
+ *  calloc()
+ *
+ *  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 <stdlib.h>
+#include <errno.h>
+
+void *realloc(
+  void *ptr,
+  size_t size
+)
+{
+  size_t  old_size;
+  char   *new_area;
+  size_t  resize;
+
+  MSBUMP(realloc_calls, 1);
+
+  /*
+   *  Do not attempt to allocate memory if in a critical section or ISR.
+   */
+
+  if (_System_state_Is_up(_System_state_Get())) {
+    if (_Thread_Dispatch_disable_level > 0)
+      return (void *) 0;
+
+    if (_ISR_Nest_level > 0)
+      return (void *) 0;
+  }
+
+  /*
+   * Continue with realloc().
+   */
+  if ( !ptr )
+    return malloc( size );
+
+  if ( !size ) {
+    free( ptr );
+    return (void *) 0;
+  }
+
+  /*
+   *  If block boundary integrity checking is enabled, then
+   *  we need to account for the boundary memory again.
+   */
+  resize = size;
+  #if defined(RTEMS_MALLOC_BOUNDARY_HELPERS)
+    if (rtems_malloc_boundary_helpers)
+      resize += (*rtems_malloc_boundary_helpers->overhead)();
+  #endif
+
+  if ( _Protected_heap_Resize_block( &RTEMS_Malloc_Heap, ptr, resize ) ) {
+    #if defined(RTEMS_MALLOC_BOUNDARY_HELPERS)
+      /*
+       *  Successful resize.  Update the boundary on the same block.
+       */
+      if (rtems_malloc_boundary_helpers)
+        (*rtems_malloc_boundary_helpers->at_realloc)(ptr, resize);
+    #endif
+    return ptr;
+  }
+
+  /*
+   *  There used to be a free on this error case but it is wrong to
+   *  free the memory per OpenGroup Single UNIX Specification V2
+   *  and the C Standard.
+   */
+
+  new_area = malloc( size );
+
+  MSBUMP(malloc_calls, -1);   /* subtract off the malloc */
+
+  if ( !new_area ) {
+    return (void *) 0;
+  }
+
+  if ( !_Protected_heap_Get_block_size(&RTEMS_Malloc_Heap, ptr, &old_size) ) {
+    errno = EINVAL;
+    return (void *) 0;
+  }
+
+  memcpy( new_area, ptr, (size < old_size) ? size : old_size );
+  free( ptr );
+
+  return new_area;
+
+}
+#endif