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

Attempt to allocate huge vectors on the heap

Browse source
This commit is contained in:
Justin Ethier 2016-07-06 23:38:57 -04:00
parent f526eeb6f3
commit aac1c44b3d
3 changed files with 34 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
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 = size; new_size = gc_heap_align(size);
} else { } else {
// Grow heap gradually using fibonnaci sequence. // Grow heap gradually using fibonnaci sequence.
size_t prev_size = GROW_HEAP_BY_SIZE; size_t prev_size = GROW_HEAP_BY_SIZE;

2
include/cyclone/types.h
View file

@ -54,7 +54,7 @@
#define DEBUG_SHOW_DIAG 0 #define DEBUG_SHOW_DIAG 0
// Show diagnostic information before/after sweeping // Show diagnostic information before/after sweeping
#define GC_DEBUG_SHOW_SWEEP_DIAG 1 #define GC_DEBUG_SHOW_SWEEP_DIAG 0
// GC debugging flags // GC debugging flags
#define GC_DEBUG_TRACE 0 #define GC_DEBUG_TRACE 0

45
runtime.c
View file

@ -1687,6 +1687,7 @@ object Cyc_make_vector(void *data, object cont, int argc, object len, ...)
object v = NULL; object v = NULL;
object fill = boolean_f; object fill = boolean_f;
int i, ulen; int i, ulen;
size_t element_vec_size;
va_list ap; va_list ap;
va_start(ap, len); va_start(ap, len);
if (argc > 1) { if (argc > 1) {
@ -1695,35 +1696,41 @@ object Cyc_make_vector(void *data, object cont, int argc, object len, ...)
va_end(ap); va_end(ap);
Cyc_check_num(data, len); Cyc_check_num(data, len);
ulen = unbox_number(len); ulen = unbox_number(len);
element_vec_size = sizeof(object) * ulen;
// TODO: if vector is too big, would need to alloc directly on the heap if (element_vec_size >= MAX_STACK_OBJ) {
// if (ulen < 10000) { // If vector is too large to allocate on the stack, allocate on heap
//
// TODO: mark this thread as potentially blocking before doing
// the allocation????
int heap_grown;
v = gc_alloc(Cyc_heap,
sizeof(vector_type) + element_vec_size,
boolean_f, // OK to populate manually over here
(gc_thread_data *)data,
&heap_grown);
((vector) v)->hdr.mark = ((gc_thread_data *)data)->gc_alloc_color;
((vector) v)->hdr.grayed = 0;
((vector) v)->tag = vector_tag;
((vector) v)->num_elements = ulen;
((vector) v)->elements = (object *)(((char *)v) + sizeof(vector_type));
} else {
v = alloca(sizeof(vector_type)); v = alloca(sizeof(vector_type));
((vector) v)->hdr.mark = gc_color_red; ((vector) v)->hdr.mark = gc_color_red;
((vector) v)->hdr.grayed = 0; ((vector) v)->hdr.grayed = 0;
((vector) v)->tag = vector_tag; ((vector) v)->tag = vector_tag;
((vector) v)->num_elements = ulen; ((vector) v)->num_elements = ulen;
((vector) v)->elements = NULL;
if (ulen > 0) {
((vector) v)->elements = ((vector) v)->elements =
(((vector) v)->num_elements > 0) ? (object *) alloca(sizeof(object) * ((vector) v)->num_elements);
(object *) alloca(sizeof(object) * ((vector) v)->num_elements) : NULL; }
}
for (i = 0; i < ((vector) v)->num_elements; i++) { for (i = 0; i < ((vector) v)->num_elements; i++) {
((vector) v)->elements[i] = fill; ((vector) v)->elements[i] = fill;
} }
// } else {
// // Experimenting with heap allocation if vector is too large
// int heap_grown;
// vector_type *vt = gc_alloc(Cyc_heap,
// sizeof(vector_type) + sizeof(object) * ulen,
// boolean_f, (gc_thread_data *)data, &heap_grown);
// mark(vt) = ((gc_thread_data *)data)->gc_alloc_color;
// type_of(vt) = vector_tag;
// vt->num_elements = ulen;
// vt->elements = (object *)((char *)vt) + sizeof(vector_type);
// for (i = 0; i < ulen; i++) {
// vt->elements[i] = fill;
// }
// v = vt;
// }
return_closcall1(data, cont, v); return_closcall1(data, cont, v);
} }