diff options
| author | Joel Sherrill <joel.sherrill@OARcorp.com> | 2007-12-19 16:03:54 +0000 |
|---|---|---|
| committer | Joel Sherrill <joel.sherrill@OARcorp.com> | 2007-12-19 16:03:54 +0000 |
| commit | 8e30a269a21cd61ca1387e666e458e52c0b153ab (patch) | |
| tree | 4d1cc760d319a170b335b9e90ea9d26162ffc687 /cpukit/libcsupport/src/free.c | |
| parent | 2007-12-18 Joel Sherrill <joel.sherrill@oarcorp.com> (diff) | |
| download | rtems-8e30a269a21cd61ca1387e666e458e52c0b153ab.tar.bz2 | |
2007-12-19 Joel Sherrill <joel.sherrill@OARcorp.com>
* libcsupport/Makefile.am, libcsupport/include/rtems/malloc.h,
libcsupport/src/free.c, libcsupport/src/malloc.c,
libcsupport/src/malloc_p.h,
libcsupport/src/malloc_report_statistics_plugin.c,
libmisc/shell/shell.c, libmisc/shell/shell.h,
score/src/objectinitializeinformation.c: Add posix_memalign. Split
out management of deferred frees to subroutines.
* libcsupport/src/malloc_deferred.c, libcsupport/src/posix_memalign.c: New files.
Diffstat (limited to 'cpukit/libcsupport/src/free.c')
| -rw-r--r-- | cpukit/libcsupport/src/free.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/cpukit/libcsupport/src/free.c b/cpukit/libcsupport/src/free.c index 160e560bba..be23388888 100644 --- a/cpukit/libcsupport/src/free.c +++ b/cpukit/libcsupport/src/free.c @@ -36,11 +36,10 @@ void free( * 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); + if ( _System_state_Is_up(_System_state_Get()) && + !malloc_is_system_state_OK() ) { + malloc_defer_free(ptr); return; - } } #if defined(RTEMS_MALLOC_BOUNDARY_HELPERS) |