djsundog
/
circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #697 from stinos/gc-debug 

gc: More verbose debugging
This commit is contained in:
Paul Sokolovsky 2014-06-20 17:33:02 +03:00
parent 09e3f8f0d1 9acb5e4cf0
commit 7efbd325bb
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
py/gc.c
View File

@ -113,7 +113,7 @@ STATIC machine_uint_t gc_lock_depth;
void gc_init(void *start, void *end) { void gc_init(void *start, void *end) {
// align end pointer on block boundary // align end pointer on block boundary
end = (void*)((machine_uint_t)end & (~(BYTES_PER_BLOCK - 1))); end = (void*)((machine_uint_t)end & (~(BYTES_PER_BLOCK - 1)));
DEBUG_printf("Initializing GC heap: %p..%p = " UINT_FMT " bytes\n", start, end, end - start); DEBUG_printf("Initializing GC heap: %p..%p = " UINT_FMT " bytes\n", start, end, (byte*)end - (byte*)start);
// calculate parameters for GC (T=total, A=alloc table, F=finaliser table, P=pool; all in bytes): // calculate parameters for GC (T=total, A=alloc table, F=finaliser table, P=pool; all in bytes):
// T = A + F + P // T = A + F + P
@ -268,6 +268,7 @@ STATIC void gc_sweep(void) {
case AT_TAIL: case AT_TAIL:
if (free_tail) { if (free_tail) {
DEBUG_printf("gc_sweep(%p)\n",PTR_FROM_BLOCK(block));
ATB_ANY_TO_FREE(block); ATB_ANY_TO_FREE(block);
} }
break; break;
@ -401,6 +402,7 @@ found:
// get pointer to first block // get pointer to first block
void *ret_ptr = (void*)(gc_pool_start + start_block * WORDS_PER_BLOCK); void *ret_ptr = (void*)(gc_pool_start + start_block * WORDS_PER_BLOCK);
DEBUG_printf("gc_alloc(%p)\n", ret_ptr);
// zero out the additional bytes of the newly allocated blocks // zero out the additional bytes of the newly allocated blocks
// This is needed because the blocks may have previously held pointers // This is needed because the blocks may have previously held pointers
@ -439,6 +441,7 @@ void gc_free(void *ptr_in) {
} }
machine_uint_t ptr = (machine_uint_t)ptr_in; machine_uint_t ptr = (machine_uint_t)ptr_in;
DEBUG_printf("gc_free(%p)\n", ptr);
if (VERIFY_PTR(ptr)) { if (VERIFY_PTR(ptr)) {
machine_uint_t block = BLOCK_FROM_PTR(ptr); machine_uint_t block = BLOCK_FROM_PTR(ptr);
@ -590,7 +593,7 @@ void *gc_realloc(void *ptr_in, machine_uint_t n_bytes) {
return NULL; return NULL;
} }
DEBUG_printf("gc_realloc: allocating new block\n"); DEBUG_printf("gc_realloc(%p -> %p)\n", ptr_in, ptr_out);
memcpy(ptr_out, ptr_in, n_blocks * BYTES_PER_BLOCK); memcpy(ptr_out, ptr_in, n_blocks * BYTES_PER_BLOCK);
gc_free(ptr_in); gc_free(ptr_in);
return ptr_out; return ptr_out;