RTOS/rtems
1
0
Fork 0
forked from Imagelibrary/rtems
Code Pull Requests Activity

malloc: Use dedicated lock for deferred frees

Browse Source
This commit is contained in:
Sebastian Huber
2016-02-25 08:03:21 +01:00
parent 287a70f935
commit 839d0a74e5
1 changed files with 26 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
cpukit/libcsupport/src/malloc_deferred.c
View File

@@ -30,7 +30,9 @@
#include <rtems/score/sysstate.h> #include <rtems/score/sysstate.h>
#include <rtems/score/threaddispatch.h> #include <rtems/score/threaddispatch.h>
RTEMS_CHAIN_DEFINE_EMPTY(RTEMS_Malloc_GC_list); static RTEMS_CHAIN_DEFINE_EMPTY( _Malloc_GC_list );
RTEMS_INTERRUPT_LOCK_DEFINE( static, _Malloc_GC_lock, "Malloc GC" )
bool malloc_is_system_state_OK(void) bool malloc_is_system_state_OK(void)
{ {
@@ -38,6 +40,18 @@ bool malloc_is_system_state_OK(void)
|| _Thread_Dispatch_is_enabled(); || _Thread_Dispatch_is_enabled();
} }
static void *_Malloc_Get_deferred_free( void )
{
rtems_interrupt_lock_context lock_context;
void *p;
rtems_interrupt_lock_acquire( &_Malloc_GC_lock, &lock_context );
p = rtems_chain_get_unprotected( &_Malloc_GC_list );
rtems_interrupt_lock_release( &_Malloc_GC_lock, &lock_context );
return p;
}
void malloc_deferred_frees_process( void ) void malloc_deferred_frees_process( void )
{ {
rtems_chain_node *to_be_freed; rtems_chain_node *to_be_freed;
@@ -45,14 +59,17 @@ void malloc_deferred_frees_process(void)
/* /*
* If some free's have been deferred, then do them now. * If some free's have been deferred, then do them now.
*/ */
while ((to_be_freed = rtems_chain_get(&RTEMS_Malloc_GC_list)) != NULL) while ( ( to_be_freed = _Malloc_Get_deferred_free() ) != NULL ) {
free( to_be_freed ); free( to_be_freed );
} }
}
void malloc_deferred_free( void malloc_deferred_free( void *p )
void *pointer
)
{ {
rtems_chain_append(&RTEMS_Malloc_GC_list, (rtems_chain_node *)pointer); rtems_interrupt_lock_context lock_context;
rtems_interrupt_lock_acquire( &_Malloc_GC_lock, &lock_context );
rtems_chain_append_unprotected( &_Malloc_GC_list, (rtems_chain_node *) p );
rtems_interrupt_lock_release( &_Malloc_GC_lock, &lock_context );
} }
#endif #endif