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

Fixes to mark_stack_or_heap_obj

Browse source 
- Detect value types and return early
- Attempt to lock less often
This commit is contained in:
Justin Ethier 2017-07-19 16:16:40 +00:00
parent f2db6235e0
commit 3fcd455189
1 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
gc.c
View file

@ -1226,16 +1226,21 @@ int gc_is_stack_obj(gc_thread_data * thd, object obj)
/** /**
* @brief Helper function for `gc_mut_update` * @brief Helper function for `gc_mut_update`
*/ */
static void mark_stack_or_heap_obj(gc_thread_data * thd, object obj) static void mark_stack_or_heap_obj(gc_thread_data * thd, object obj, int locked)
{ {
if (gc_is_stack_obj(thd, obj)) { if (!is_object_type(obj) || type_of(obj) == boolean_tag) {
return;
}
else if (gc_is_stack_obj(thd, obj)) {
// Set object to be marked after moved to heap by next GC. // Set object to be marked after moved to heap by next GC.
// This avoids having to recursively examine the stack now, // This avoids having to recursively examine the stack now,
// which we have to do anyway during minor GC. // which we have to do anyway during minor GC.
grayed(obj) = 1; grayed(obj) = 1;
} else { } else {
// Value is on the heap, mark gray right now // Value is on the heap, mark gray right now
if (!locked) { pthread_mutex_lock(&(thd->lock)); }
gc_mark_gray(thd, obj); gc_mark_gray(thd, obj);
if (!locked) { pthread_mutex_unlock(&(thd->lock)); }
} }
} }
@ -1254,16 +1259,14 @@ void gc_mut_update(gc_thread_data * thd, object old_obj, object value)
stage = ck_pr_load_int(&gc_stage); stage = ck_pr_load_int(&gc_stage);
if (ck_pr_load_int(&(thd->gc_status)) != STATUS_ASYNC) { if (ck_pr_load_int(&(thd->gc_status)) != STATUS_ASYNC) {
pthread_mutex_lock(&(thd->lock)); pthread_mutex_lock(&(thd->lock));
mark_stack_or_heap_obj(thd, old_obj); mark_stack_or_heap_obj(thd, old_obj, 1);
mark_stack_or_heap_obj(thd, value); mark_stack_or_heap_obj(thd, value, 1);
pthread_mutex_unlock(&(thd->lock)); pthread_mutex_unlock(&(thd->lock));
} else if (stage == STAGE_TRACING) { } else if (stage == STAGE_TRACING) {
//fprintf(stderr, "DEBUG - GC async tracing marking heap obj %p ", old_obj); //fprintf(stderr, "DEBUG - GC async tracing marking heap obj %p ", old_obj);
//Cyc_display(old_obj, stderr); //Cyc_display(old_obj, stderr);
//fprintf(stderr, "\n"); //fprintf(stderr, "\n");
pthread_mutex_lock(&(thd->lock)); mark_stack_or_heap_obj(thd, old_obj, 0);
mark_stack_or_heap_obj(thd, old_obj);
pthread_mutex_unlock(&(thd->lock));
#if GC_DEBUG_VERBOSE #if GC_DEBUG_VERBOSE
if (is_object_type(old_obj) && mark(old_obj) == gc_color_clear) { if (is_object_type(old_obj) && mark(old_obj) == gc_color_clear) {
fprintf(stderr, fprintf(stderr,