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

WIP

Browse source
This commit is contained in:
Justin Ethier 2015-12-01 22:41:11 -05:00
parent 524e922ee0
commit c70a69c202
2 changed files with 25 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
gc.c
View file

@ -697,14 +697,14 @@ PHASE 2 - multi-threaded mutator (IE, more than one stack thread):
// Scan the given object and its refs, marking all heap objects. The issue // Scan the given object and its refs, marking all heap objects. The issue
// here is that the heap's write barrier can be invoked at any time and // here is that the heap's write barrier can be invoked at any time and
// we need to ensure any heap objects affected are traced // we need to ensure any heap objects affected are traced
void gc_stack_mark_gray(gc_thread_data *thd, object obj) void gc_stack_mark_gray3(gc_thread_data *thd, object obj, int depth)
{ {
char tmp; char tmp;
object low_limit = &tmp; object low_limit = &tmp;
object high_limit = ((gc_thread_data *)thd)->stack_start; object high_limit = ((gc_thread_data *)thd)->stack_start;
int color; int color;
if (is_object_type(obj)) { if (is_object_type(obj) && depth < 100) {
color = mark(obj); color = mark(obj);
#if GC_SAFETY_CHECKS #if GC_SAFETY_CHECKS
if (check_overflow(low_limit, obj) && if (check_overflow(low_limit, obj) &&
@ -718,12 +718,18 @@ void gc_stack_mark_gray(gc_thread_data *thd, object obj)
#endif #endif
if (color == gc_color_clear) { if (color == gc_color_clear) {
gc_mark_gray(thd, obj); gc_mark_gray(thd, obj);
printf("marked heap obj from stack barrier %p %d\n", obj, color);
} else if (color == gc_color_red) { } else if (color == gc_color_red) {
gc_stack_mark_refs_gray(thd, obj); gc_stack_mark_refs_gray(thd, obj, depth + 1);
} }
} }
} }
void gc_stack_mark_gray(gc_thread_data *thd, object obj)
{
gc_stack_mark_gray3(thd, obj, 0);
}
// Should only be called from above function as a helper // Should only be called from above function as a helper
// //
// TODO: this will probably hang procssing circular // TODO: this will probably hang procssing circular
@ -733,41 +739,41 @@ void gc_stack_mark_gray(gc_thread_data *thd, object obj)
// been visited. trick is that, unlike in other places, the // been visited. trick is that, unlike in other places, the
// nodes may be visited multiple times so cannot destructively // nodes may be visited multiple times so cannot destructively
// alter them. // alter them.
void gc_stack_mark_refs_gray(gc_thread_data *thd, object obj) void gc_stack_mark_refs_gray(gc_thread_data *thd, object obj, int depth)
{ {
switch(type_of(obj)) { switch(type_of(obj)) {
case cons_tag: { case cons_tag: {
gc_stack_mark_gray(thd, car(obj)); gc_stack_mark_gray3(thd, car(obj), depth);
gc_stack_mark_gray(thd, cdr(obj)); gc_stack_mark_gray3(thd, cdr(obj), depth);
break; break;
} }
case closure1_tag: case closure1_tag:
gc_stack_mark_gray(thd, ((closure1) obj)->elt1); gc_stack_mark_gray3(thd, ((closure1) obj)->elt1, depth);
break; break;
case closure2_tag: case closure2_tag:
gc_stack_mark_gray(thd, ((closure2) obj)->elt1); gc_stack_mark_gray3(thd, ((closure2) obj)->elt1, depth);
gc_stack_mark_gray(thd, ((closure2) obj)->elt2); gc_stack_mark_gray3(thd, ((closure2) obj)->elt2, depth);
case closure3_tag: case closure3_tag:
gc_stack_mark_gray(thd, ((closure3) obj)->elt1); gc_stack_mark_gray3(thd, ((closure3) obj)->elt1, depth);
gc_stack_mark_gray(thd, ((closure3) obj)->elt2); gc_stack_mark_gray3(thd, ((closure3) obj)->elt2, depth);
gc_stack_mark_gray(thd, ((closure3) obj)->elt3); gc_stack_mark_gray3(thd, ((closure3) obj)->elt3, depth);
case closure4_tag: case closure4_tag:
gc_stack_mark_gray(thd, ((closure4) obj)->elt1); gc_stack_mark_gray3(thd, ((closure4) obj)->elt1, depth);
gc_stack_mark_gray(thd, ((closure4) obj)->elt2); gc_stack_mark_gray3(thd, ((closure4) obj)->elt2, depth);
gc_stack_mark_gray(thd, ((closure4) obj)->elt3); gc_stack_mark_gray3(thd, ((closure4) obj)->elt3, depth);
gc_stack_mark_gray(thd, ((closure4) obj)->elt4); gc_stack_mark_gray3(thd, ((closure4) obj)->elt4, depth);
break; break;
case closureN_tag: { case closureN_tag: {
int i, n = ((closureN) obj)->num_elt; int i, n = ((closureN) obj)->num_elt;
for (i = 0; i < n; i++) { for (i = 0; i < n; i++) {
gc_stack_mark_gray(thd, ((closureN) obj)->elts[i]); gc_stack_mark_gray3(thd, ((closureN) obj)->elts[i], depth);
} }
break; break;
} }
case vector_tag: { case vector_tag: {
int i, n = ((vector) obj)->num_elt; int i, n = ((vector) obj)->num_elt;
for (i = 0; i < n; i++) { for (i = 0; i < n; i++) {
gc_stack_mark_gray(thd, ((vector) obj)->elts[i]); gc_stack_mark_gray3(thd, ((vector) obj)->elts[i], depth);
} }
break; break;
} }

2
include/cyclone/types.h
View file

@ -160,7 +160,7 @@ void gc_thread_data_free(gc_thread_data *thd);
// Prototypes for mutator/collector: // Prototypes for mutator/collector:
void gc_mut_update(gc_thread_data *thd, object old_obj, object value); void gc_mut_update(gc_thread_data *thd, object old_obj, object value);
void gc_mut_cooperate(gc_thread_data *thd); void gc_mut_cooperate(gc_thread_data *thd);
void gc_stack_mark_refs_gray(gc_thread_data *thd, object obj); void gc_stack_mark_refs_gray(gc_thread_data *thd, object obj, int depth);
void gc_stack_mark_gray(gc_thread_data *thd, object obj); void gc_stack_mark_gray(gc_thread_data *thd, object obj);
void gc_mark_gray(gc_thread_data *thd, object obj); void gc_mark_gray(gc_thread_data *thd, object obj);
void gc_collector_trace(); void gc_collector_trace();