mirrors/janet
1
0
Fork 0
mirror of https://github.com/janet-lang/janet synced 2025-05-28 12:14:13 +00:00
Code Issues 1 Releases Wiki Activity

Simpler changes to GC that don't kill performance as badly.

Browse Source
This commit is contained in:
Calvin Rose 2018-09-23 17:45:05 -04:00
parent 486ce6bc81
commit 5f7c213c7b
2 changed files with 30 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/core/gc.c
View File

@ -49,20 +49,30 @@ static void janet_mark_string(const uint8_t *str);
static void janet_mark_fiber(JanetFiber *fiber); static void janet_mark_fiber(JanetFiber *fiber);
static void janet_mark_abstract(void *adata); static void janet_mark_abstract(void *adata);
/* Local state that is only temporary */
static JANET_THREAD_LOCAL uint32_t depth = JANET_RECURSION_GUARD;
static JANET_THREAD_LOCAL uint32_t orig_rootcount;
/* Mark a value */ /* Mark a value */
void janet_mark(Janet x) { void janet_mark(Janet x) {
switch (janet_type(x)) { if (depth) {
default: break; depth--;
case JANET_STRING: switch (janet_type(x)) {
case JANET_SYMBOL: janet_mark_string(janet_unwrap_string(x)); break; default: break;
case JANET_FUNCTION: janet_mark_function(janet_unwrap_function(x)); break; case JANET_STRING:
case JANET_ARRAY: janet_mark_array(janet_unwrap_array(x)); break; case JANET_SYMBOL: janet_mark_string(janet_unwrap_string(x)); break;
case JANET_TABLE: janet_mark_table(janet_unwrap_table(x)); break; case JANET_FUNCTION: janet_mark_function(janet_unwrap_function(x)); break;
case JANET_STRUCT: janet_mark_struct(janet_unwrap_struct(x)); break; case JANET_ARRAY: janet_mark_array(janet_unwrap_array(x)); break;
case JANET_TUPLE: janet_mark_tuple(janet_unwrap_tuple(x)); break; case JANET_TABLE: janet_mark_table(janet_unwrap_table(x)); break;
case JANET_BUFFER: janet_mark_buffer(janet_unwrap_buffer(x)); break; case JANET_STRUCT: janet_mark_struct(janet_unwrap_struct(x)); break;
case JANET_FIBER: janet_mark_fiber(janet_unwrap_fiber(x)); break; case JANET_TUPLE: janet_mark_tuple(janet_unwrap_tuple(x)); break;
case JANET_ABSTRACT: janet_mark_abstract(janet_unwrap_abstract(x)); break; case JANET_BUFFER: janet_mark_buffer(janet_unwrap_buffer(x)); break;
case JANET_FIBER: janet_mark_fiber(janet_unwrap_fiber(x)); break;
case JANET_ABSTRACT: janet_mark_abstract(janet_unwrap_abstract(x)); break;
}
depth++;
} else {
janet_gcroot(x);
} }
} }
@ -317,8 +327,14 @@ void *janet_gcalloc(enum JanetMemoryType type, size_t size) {
void janet_collect(void) { void janet_collect(void) {
uint32_t i; uint32_t i;
if (janet_vm_gc_suspend) return; if (janet_vm_gc_suspend) return;
for (i = 0; i < janet_vm_root_count; i++) depth = JANET_RECURSION_GUARD;
orig_rootcount = janet_vm_root_count;
for (i = 0; i < orig_rootcount; i++)
janet_mark(janet_vm_roots[i]); janet_mark(janet_vm_roots[i]);
while (orig_rootcount < janet_vm_root_count) {
Janet x = janet_vm_roots[--janet_vm_root_count];
janet_mark(x);
}
janet_sweep(); janet_sweep();
janet_vm_next_collection = 0; janet_vm_next_collection = 0;
} }

2
src/core/vm.c
View File

@ -1333,7 +1333,7 @@ int janet_init(void) {
* a collection pretty much every cycle, which is * a collection pretty much every cycle, which is
* incredibly horrible for performance, but can help ensure * incredibly horrible for performance, but can help ensure
* there are no memory bugs during development */ * there are no memory bugs during development */
janet_vm_gc_interval = 0x1000000; janet_vm_gc_interval = 0x10000;
janet_symcache_init(); janet_symcache_init();
/* Initialize gc roots */ /* Initialize gc roots */
janet_vm_roots = NULL; janet_vm_roots = NULL;