steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Disable logging for now

db4
Slava Pestov 2008-04-04 22:40:48 -05:00
parent 6a823c4a69
commit 3eeffbb104
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
vm/code_gc.c
View File

@ -181,6 +181,7 @@ void free_unmarked(F_HEAP *heap)
} }
break; break;
case B_FREE: case B_FREE:
printf("RECLAIMED\n");
if(prev && prev->status == B_FREE) if(prev && prev->status == B_FREE)
prev->size += scan->size; prev->size += scan->size;
break; break;

15
vm/data_gc.c
View File

@ -1,6 +1,6 @@
#include "master.h" #include "master.h"
#define GC_DEBUG 1 //#define GC_DEBUG 1
#define ALLOC_DATA_HEAP "alloc_data_heap: gens=%ld, young_size=%ld, aging_size=%ld\n" #define ALLOC_DATA_HEAP "alloc_data_heap: gens=%ld, young_size=%ld, aging_size=%ld\n"
#define GC_REQUESTED "garbage_collection: code_gc=%d, growing_data_heap=%d, requested_bytes=%ld\n" #define GC_REQUESTED "garbage_collection: code_gc=%d, growing_data_heap=%d, requested_bytes=%ld\n"
@ -12,7 +12,7 @@
#ifdef GC_DEBUG #ifdef GC_DEBUG
#define GC_PRINT printf #define GC_PRINT printf
#else #else
INLINE void GC_PRINT(...) { } INLINE void GC_PRINT() { }
#endif #endif
CELL init_zone(F_ZONE *z, CELL size, CELL start) CELL init_zone(F_ZONE *z, CELL size, CELL start)
@ -584,7 +584,10 @@ CELL collect_next(CELL scan)
do_slots(scan,copy_handle); do_slots(scan,copy_handle);
if(collecting_code) if(collecting_code)
{
printf("do_code_slots\n");
do_code_slots(scan); do_code_slots(scan);
}
return scan + untagged_object_size(scan); return scan + untagged_object_size(scan);
} }
@ -720,6 +723,8 @@ void garbage_collection(CELL gen,
growing_data_heap = growing_data_heap_; growing_data_heap = growing_data_heap_;
collecting_gen = gen; collecting_gen = gen;
//if(collecting_gen == TENURED) collecting_code = true;
/* we come back here if a generation is full */ /* we come back here if a generation is full */
if(setjmp(gc_jmp)) if(setjmp(gc_jmp))
{ {
@ -727,15 +732,15 @@ void garbage_collection(CELL gen,
resort to growing the data heap */ resort to growing the data heap */
if(collecting_gen == TENURED) if(collecting_gen == TENURED)
{ {
if(collecting_code) //if(collecting_code)
{ {
growing_data_heap = true; growing_data_heap = true;
/* see the comment in unmark_marked() */ /* see the comment in unmark_marked() */
unmark_marked(&code_heap); unmark_marked(&code_heap);
} }
else //else
collecting_code = true; // collecting_code = true;
} }
/* we try collecting AGING space twice before going on to /* we try collecting AGING space twice before going on to
collect TENURED */ collect TENURED */