Fcalva/cyclone
1
0
Fork 0
mirror of https://github.com/justinethier/cyclone.git synced 2025-05-25 04:55:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Mark current continuation during GC coop

Browse source 
Mark both current cont (gc_cont + args) as well as all moved objects during cooperation. Trying to prevent cases of valid objects being collected when they should have been part of the continuation chain (IE, parens in read:parse).
This commit is contained in:
Justin Ethier 2015-12-09 23:38:15 -05:00
parent ce500fff3e
commit 15ac239d2f
1 changed files with 17 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
gc.c
View file

@ -759,15 +759,21 @@ void gc_mut_cooperate(gc_thread_data *thd, int buf_len)
pthread_mutex_unlock(&(thd->lock)); pthread_mutex_unlock(&(thd->lock));
} }
else if (thd->gc_status == STATUS_SYNC2) { else if (thd->gc_status == STATUS_SYNC2) {
// Mark thread "roots"
// In this case, mark everything the collector moved to the heap
pthread_mutex_lock(&(thd->lock));
for (i = 0; i < buf_len; i++) {
gc_mark_gray(thd, thd->moveBuf[i]);
}
#if GC_DEBUG_VERBOSE #if GC_DEBUG_VERBOSE
debug_print = 1; debug_print = 1;
#endif #endif
// Mark thread "roots":
// Begin my marking current continuation, which may have already
// been on the heap prior to latest minor GC
pthread_mutex_lock(&(thd->lock));
gc_mark_gray(thd, thd->gc_cont);
for (i = 0; i < thd->gc_num_args; i++) {
gc_mark_gray(thd, thd->gc_args[i]);
}
// Also, mark everything the collector moved to the heap
for (i = 0; i < buf_len; i++) {
gc_mark_gray(thd, thd->moveBuf[i]);
}
pthread_mutex_unlock(&(thd->lock)); pthread_mutex_unlock(&(thd->lock));
thd->gc_alloc_color = ATOMIC_GET(&gc_color_mark); thd->gc_alloc_color = ATOMIC_GET(&gc_color_mark);
} }
@ -775,8 +781,12 @@ void gc_mut_cooperate(gc_thread_data *thd, int buf_len)
} }
#if GC_DEBUG_VERBOSE #if GC_DEBUG_VERBOSE
if (debug_print) { if (debug_print) {
fprintf(stderr, "coop mark gc_cont %p\n", thd->gc_cont);
for (i = 0; i < thd->gc_num_args; i++) {
fprintf(stderr, "coop mark gc_args[%d] %p\n", i, thd->gc_args[i]);
}
for (i = 0; i < buf_len; i++) { for (i = 0; i < buf_len; i++) {
fprintf(stderr, "mark from move buf %i %p\n", i, thd->moveBuf[i]); fprintf(stderr, "coop mark from move buf %i %p\n", i, thd->moveBuf[i]);
} }
} }
#endif #endif