mirrors
/
micropython
mirror of https://github.com/micropython/micropython.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

py/gc: Factor out a macro to trace GC mark operations. 

To allow easier override it for custom tracing.
This commit is contained in:
Paul Sokolovsky 2017-12-09 01:48:26 +02:00
parent 39dd89fe31
commit 5453d88d5d
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
py/gc.c
View File

@ -195,6 +195,14 @@ bool gc_is_locked(void) {
&& ptr < (void*)MP_STATE_MEM(gc_pool_end) /* must be below end of pool */ \ && ptr < (void*)MP_STATE_MEM(gc_pool_end) /* must be below end of pool */ \
) )
#ifndef TRACE_MARK
#if DEBUG_PRINT
#define TRACE_MARK(block, ptr) DEBUG_printf("gc_mark(%p)\n", ptr)
#else
#define TRACE_MARK(block, ptr)
#endif
#endif
// ptr should be of type void* // ptr should be of type void*
#define VERIFY_MARK_AND_PUSH(ptr) \ #define VERIFY_MARK_AND_PUSH(ptr) \
do { \ do { \
@ -202,7 +210,7 @@ bool gc_is_locked(void) {
size_t _block = BLOCK_FROM_PTR(ptr); \ size_t _block = BLOCK_FROM_PTR(ptr); \
if (ATB_GET_KIND(_block) == AT_HEAD) { \ if (ATB_GET_KIND(_block) == AT_HEAD) { \
/* an unmarked head, mark it, and push it on gc stack */ \ /* an unmarked head, mark it, and push it on gc stack */ \
DEBUG_printf("gc_mark(%p)\n", ptr); \ TRACE_MARK(_block, ptr); \
ATB_HEAD_TO_MARK(_block); \ ATB_HEAD_TO_MARK(_block); \
if (MP_STATE_MEM(gc_sp) < &MP_STATE_MEM(gc_stack)[MICROPY_ALLOC_GC_STACK_SIZE]) { \ if (MP_STATE_MEM(gc_sp) < &MP_STATE_MEM(gc_stack)[MICROPY_ALLOC_GC_STACK_SIZE]) { \
*MP_STATE_MEM(gc_sp)++ = _block; \ *MP_STATE_MEM(gc_sp)++ = _block; \