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

Bug fixes for huge heap objects

Browse source
This commit is contained in:
Justin Ethier 2016-07-07 03:28:17 -04:00
parent fe27aff148
commit d362f15ede
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
gc.c
View file

@ -433,7 +433,7 @@ int gc_grow_heap(gc_heap * h, int heap_type, size_t size, size_t chunk_size)
pthread_mutex_lock(&heap_lock); pthread_mutex_lock(&heap_lock);
// Compute size of new heap page // Compute size of new heap page
if (heap_type == HEAP_HUGE) { if (heap_type == HEAP_HUGE) {
new_size = gc_heap_align(size); new_size = gc_heap_align(size) + 128;
while (h_last->next) { while (h_last->next) {
h_last = h_last->next; h_last = h_last->next;
} }
@ -496,11 +496,14 @@ void *gc_try_alloc(gc_heap * h, int heap_type, size_t size, char *obj,
} else { /* Take the whole chunk */ } else { /* Take the whole chunk */
f1->next = f2->next; f1->next = f2->next;
} }
if (heap_type != HEAP_HUGE) {
// Copy object into heap now to avoid any uninitialized memory issues // Copy object into heap now to avoid any uninitialized memory issues
gc_copy_obj(f2, obj, thd); gc_copy_obj(f2, obj, thd);
//h->free_size -= gc_allocated_bytes(obj, NULL, NULL); //h->free_size -= gc_allocated_bytes(obj, NULL, NULL);
cached_heap_free_sizes[heap_type] -= cached_heap_free_sizes[heap_type] -=
gc_allocated_bytes(obj, NULL, NULL); gc_allocated_bytes(obj, NULL, NULL);
}
pthread_mutex_unlock(&heap_lock); pthread_mutex_unlock(&heap_lock);
return f2; return f2;
} }