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. --- cpukit/libcsupport/src/free.c | 69 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 69 insertions(+) create mode 100644 cpukit/libcsupport/src/free.c (limited to 'cpukit/libcsupport/src/free.c') diff --git a/cpukit/libcsupport/src/free.c b/cpukit/libcsupport/src/free.c new file mode 100644 index 0000000000..160e560bba --- /dev/null +++ b/cpukit/libcsupport/src/free.c @@ -0,0 +1,69 @@ +/* + * 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 + +void free( + void *ptr +) +{ + MSBUMP(free_calls, 1); + + if ( !ptr ) + return; + + #if defined(RTEMS_HEAP_DEBUG) + _Protected_heap_Walk( &RTEMS_Malloc_Heap, 0, FALSE ); + #endif + + /* + * Do not attempt to free memory if in a critical section or ISR. + */ + + if (_System_state_Is_up(_System_state_Get())) { + if ((_Thread_Dispatch_disable_level > 0) || (_ISR_Nest_level > 0)) { + Chain_Append(&RTEMS_Malloc_GC_list, (Chain_Node *)ptr); + return; + } + } + + #if defined(RTEMS_MALLOC_BOUNDARY_HELPERS) + /* + * If configured, check the boundary area + */ + if ( rtems_malloc_boundary_helpers ) + (*rtems_malloc_boundary_helpers->at_free)(ptr); + #endif + + /* + * If configured, update the statistics + */ + if ( rtems_malloc_statistics_helpers ) + (*rtems_malloc_statistics_helpers->at_free)(ptr); + + if ( !_Protected_heap_Free( &RTEMS_Malloc_Heap, ptr ) ) { + printk( "Program heap: free of bad pointer %p -- range %p - %p \n", + ptr, + RTEMS_Malloc_Heap.start, + RTEMS_Malloc_Heap.end + ); + } + +} +#endif -- cgit v1.2.3