suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

incremental GC: more precising counting of work done

Browse Source
This commit is contained in:
Matthew Flatt 2015-12-07 16:39:33 -05:00
parent 5cd2220366
commit 6f106d9adc
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
racket/src/racket/gc2/newgc.c
View File

@ -4062,6 +4062,8 @@ void GC_mark2(void *pp, struct NewGC *gc)
new_type = 0; /* i.e., not in gen 1/2 */ new_type = 0; /* i.e., not in gen 1/2 */
} }
gc->copy_count += size;
/* transfer the object */ /* transfer the object */
ohead->mark = 1; /* mark is copied to newplace, too */ ohead->mark = 1; /* mark is copied to newplace, too */
if (size == PAIR_SIZE_IN_BYTES) if (size == PAIR_SIZE_IN_BYTES)
@ -4167,6 +4169,8 @@ static inline void propagate_marks_worker(NewGC *gc, void *pp, int inc_gen1)
end = PPTR(info) + info->size; end = PPTR(info) + info->size;
} }
gc->traverse_count += (end - start);
mark_traverse_object(gc, start, end, alloc_type); mark_traverse_object(gc, start, end, alloc_type);
} }
@ -4207,8 +4211,18 @@ static int propagate_incremental_marks(NewGC *gc, int do_emph, int fuel)
void *p; void *p;
while (fuel && pop_ptr(gc, &p, 1)) { while (fuel && pop_ptr(gc, &p, 1)) {
GCDEBUG((DEBUGOUTF, "Popped incremental pointer %p\n", p)); GCDEBUG((DEBUGOUTF, "Popped incremental pointer %p\n", p));
gc->copy_count = 0;
gc->traverse_count = 0;
propagate_marks_worker(gc, p, 1); propagate_marks_worker(gc, p, 1);
if (fuel > 0) {
fuel--; fuel--;
fuel -= (gc->copy_count >> 2);
fuel -= (gc->traverse_count >> 2);
if (fuel < 0)
fuel = 0;
}
} }
} while (do_emph && fuel && mark_ready_ephemerons(gc, 1)); } while (do_emph && fuel && mark_ready_ephemerons(gc, 1));

2
racket/src/racket/gc2/newgc.h
View File

@ -243,6 +243,8 @@ typedef struct NewGC {
uintptr_t prop_count; uintptr_t prop_count;
uintptr_t inc_prop_count; uintptr_t inc_prop_count;
uintptr_t copy_count; /* bytes */
uintptr_t traverse_count; /* words */
/* These collect information about memory usage, for use in GC_dump. */ /* These collect information about memory usage, for use in GC_dump. */
uintptr_t peak_memory_use; uintptr_t peak_memory_use;