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

WIP

Browse source
This commit is contained in:
Justin Ethier 2015-11-11 22:58:53 -05:00
parent c9d24c9a02
commit cb7274526c
1 changed files with 22 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
gc.c
View file

@ -100,6 +100,7 @@ int gc_grow_heap(gc_heap *h, size_t size, size_t chunk_size)
h_new = gc_heap_create(new_size, h_last->max_size, chunk_size); h_new = gc_heap_create(new_size, h_last->max_size, chunk_size);
h_last->next = h_new; h_last->next = h_new;
pthread_mutex_unlock(&heap_lock); pthread_mutex_unlock(&heap_lock);
printf("DEBUG - grew heap\n");
return (h_new != NULL); return (h_new != NULL);
} }
@ -214,12 +215,12 @@ gc_heap *gc_heap_last(gc_heap *h)
size_t gc_heap_total_size(gc_heap *h) size_t gc_heap_total_size(gc_heap *h)
{ {
size_t total_size = 0; size_t total_size = 0;
//pthread_mutex_lock(&heap_lock); pthread_mutex_lock(&heap_lock);
while(h) { while(h) {
total_size += h->size; total_size += h->size;
h = h->next; h = h->next;
} }
//pthread_mutex_unlock(&heap_lock); pthread_mutex_unlock(&heap_lock);
return total_size; return total_size;
} }
@ -529,7 +530,7 @@ void gc_mut_cooperate(gc_thread_data *thd)
// to worry about anything on the stack that is referencing a heap object // to worry about anything on the stack that is referencing a heap object
// For each x in roots: // For each x in roots:
// MarkGray(x) // MarkGray(x)
thd->gc_alloc_color = gc_color_mark; // TODO: synchronization for global?? thd->gc_alloc_color = ATOMIC_GET(&gc_color_mark); // TODO: synchronization for global??
} }
thd->gc_status = gc_status_col; // TODO: syncronization?? thd->gc_status = gc_status_col; // TODO: syncronization??
} }
@ -593,7 +594,7 @@ void gc_mark_black(object obj)
// TODO: is sync required to get colors? probably not on the collector // TODO: is sync required to get colors? probably not on the collector
// thread (at least) since colors are only changed once during the clear // thread (at least) since colors are only changed once during the clear
// phase and before the first handshake. // phase and before the first handshake.
int markColor = gc_color_mark; //TODO: is atomic require here?? ATOMIC_GET(&gc_color_mark); int markColor = ATOMIC_GET(&gc_color_mark);
if (is_object_type(obj) && mark(obj) != markColor) { if (is_object_type(obj) && mark(obj) != markColor) {
// Gray any child objects // Gray any child objects
// Note we probably should use some form of atomics/synchronization // Note we probably should use some form of atomics/synchronization
@ -703,20 +704,21 @@ void gc_wait_handshake()
// Main collector function // Main collector function
void gc_collector() void gc_collector()
{ {
int tmp; int old_clear, old_mark;
size_t freed = 0, max_freed = 0; size_t freed = 0, max_freed = 0, total_size;
#if GC_DEBUG_CONCISE_PRINTFS //#if GC_DEBUG_CONCISE_PRINTFS
time_t sweep_start = time(NULL); time_t sweep_start = time(NULL);
#endif //#endif
// TODO: what kind of sync is required here? // TODO: what kind of sync is required here?
//clear : //clear :
gc_stage = STAGE_CLEAR_OR_MARKING; gc_stage = STAGE_CLEAR_OR_MARKING;
// exchange values of markColor and clearColor // exchange values of markColor and clearColor
// TODO: synchronize? old_clear = ATOMIC_GET(&gc_color_clear);
tmp = gc_color_clear; old_mark = ATOMIC_GET(&gc_color_mark);
gc_color_clear = gc_color_mark; while(!ATOMIC_SET_IF_EQ(&gc_color_clear, old_clear, old_mark)){}
gc_color_mark = tmp; while(!ATOMIC_SET_IF_EQ(&gc_color_mark, old_mark, old_clear)){}
printf("DEBUG - swap clear %d / mark %d\n", gc_color_clear, gc_color_mark);
gc_handshake(STATUS_SYNC1); gc_handshake(STATUS_SYNC1);
//mark : //mark :
gc_handshake(STATUS_SYNC2); gc_handshake(STATUS_SYNC2);
@ -730,10 +732,11 @@ void gc_collector()
// //
//sweep : //sweep :
max_freed = gc_sweep(Cyc_get_heap(), &freed); max_freed = gc_sweep(Cyc_get_heap(), &freed);
#if GC_DEBUG_CONCISE_PRINTFS // TODO: grow heap if it is mostly full after collection??
//#if GC_DEBUG_CONCISE_PRINTFS
printf("sweep done, freed = %d, max_freed = %d, elapsed = %ld\n", printf("sweep done, freed = %d, max_freed = %d, elapsed = %ld\n",
freed, max_freed, time(NULL) - sweep_start); freed, max_freed, time(NULL) - sweep_start);
#endif //#endif
gc_stage = STAGE_RESTING; gc_stage = STAGE_RESTING;
} }
@ -741,7 +744,11 @@ void *collector_main(void *arg)
{ {
while (1) { while (1) {
gc_collector(); gc_collector();
sleep(1); // TODO: how to schedule this thread? // TODO: how to schedule this thread?
// this is inefficient but it should be good enough to
// at least stand up this collector. then we'll have to
// come back and improve it
sleep(1);
} }
} }