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

Added heap merge functions

Browse source
This commit is contained in:
Justin Ethier 2017-01-27 22:37:55 -05:00
parent 8b530989ee
commit e30ff16b3d
2 changed files with 30 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
gc.c
View file

@ -1684,11 +1684,11 @@ void gc_thread_data_free(gc_thread_data * thd)
{ {
if (thd) { if (thd) {
// //
!! // !!
TODO: (not necessarily here, but somewhere need to roll heap pages into // TODO: (not necessarily here, but somewhere need to roll heap pages into
another thread data. need to include cached heap sizes/total, too. // another thread data. need to include cached heap sizes/total, too.
then free cached heap vars here. // then free cached heap vars here.
!! // !!
// //
if (pthread_mutex_destroy(&thd->lock) != 0) { if (pthread_mutex_destroy(&thd->lock) != 0) {
// TODO: can only destroy the lock if it is unlocked. need to make sure we // TODO: can only destroy the lock if it is unlocked. need to make sure we
@ -1714,6 +1714,29 @@ void gc_thread_data_free(gc_thread_data * thd)
} }
} }
/**
* Merge one heap into another. Assumes appropriate locks are already held.
*/
void gc_heap_merge(gc_heap *hdest, gc_heap *hsrc)
{
gc_heap *last = gc_heap_last(hdest);
last->next = hsrc;
}
void gc_heap_merge_all(gc_heap_root *dest, gc_heap_root *src)
{
gc_heap *hdest, *hsrc;
int heap_type;
for (heap_type = 0; heap_type < NUM_HEAP_TYPES; heap_type++) {
hdest = dest->heap[heap_type];
hsrc = src->heap[heap_type];
if (hdest && hsrc) {
gc_heap_merge(hdest, hsrc);
}
}
}
/** /**
* Called explicitly from a mutator thread to let the collector know * Called explicitly from a mutator thread to let the collector know
* it (may) block for an unknown period of time. * it (may) block for an unknown period of time.

2
include/cyclone/types.h
View file

@ -662,6 +662,8 @@ void gc_remove_mutator(gc_thread_data * thd);
gc_heap *gc_heap_create(int heap_type, size_t size, size_t max_size, gc_heap *gc_heap_create(int heap_type, size_t size, size_t max_size,
size_t chunk_size, gc_thread_data *thd); size_t chunk_size, gc_thread_data *thd);
gc_heap *gc_heap_free(gc_heap *page, gc_heap *prev_page); gc_heap *gc_heap_free(gc_heap *page, gc_heap *prev_page);
void gc_heap_merge(gc_heap *hdest, gc_heap *hsrc);
void gc_heap_merge_all(gc_heap_root *dest, gc_heap_root *src);
void gc_print_stats(gc_heap * h); void gc_print_stats(gc_heap * h);
int gc_grow_heap(gc_heap * h, int heap_type, size_t size, size_t chunk_size, gc_thread_data *thd); int gc_grow_heap(gc_heap * h, int heap_type, size_t size, size_t chunk_size, gc_thread_data *thd);
char *gc_copy_obj(object hp, char *obj, gc_thread_data * thd); char *gc_copy_obj(object hp, char *obj, gc_thread_data * thd);