@@ -18,7 +18,7 @@ |# (library (core.exceptions) (export with-exception-handler raise raise-continuable assert error - assertion-violation describe-os-error) + assertion-violation) (import (core.forms)) (define (default-exception obj) @@ -61,8 +61,4 @@ (define assertion-violation error) - (define (describe-os-error) - (builtin-call os-strerror - (builtin-call os-errno))) - ) scheme/core.exceptions.scm @@ -4,7 +4,7 @@ LDFLAGS += -pthread vm_obj = vm.o heap.o native.o primitives.o hash.o \ module.o strings.o bytevector.o struct.o \ - posix.o const_allocator.o types.o + const_allocator.o types.o .PHONY: all clean all: vm vm/Makefile @@ -25,7 +25,7 @@ /* TODO: tune it */ #define FRESH_SIZE 1024*128 #define SURVIVED_SIZE 1024*128 -#define OLD_SIZE 1024*512 +#define OLD_SIZE SURVIVED_SIZE*5 #define HEAP_DBG printf #define NEXT_HDR(h) (BHDR_SIZE + (h)->size + (void*)h) @@ -295,8 +295,13 @@ void heap_gc(heap_t *heap) heap_swap_survived(heap); thread_after_gc(&heap->visitor, heap->thread); - if (heap->old.free_mem < SURVIVED_SIZE) - heap->full_gc = 1; /* Tell to perform full gc next time */ + /* + * Schedule full gc for the next time if old space present and may + * not feet survived space + */ + if (heap->old.mem + && (heap->old.free_mem < SURVIVED_SIZE)) + heap->full_gc = 1; gettimeofday(&tv2, NULL); timersub(&tv2, &tv1, &tv3); @@ -350,7 +355,8 @@ static void heap_mark(visitor_t *visitor, obj_t *obj) return; void *p = PTR(*obj); - if (p < heap->mem || p > heap->mem+heap->mem_size) + if ((p < heap->mem || p > heap->mem+heap->mem_size) + && !in_space(&heap->old, p)) FATAL("Trying to mark %p which doesn't belong to this heap\n", p); if (in_space(heap->future_survived, p)) { @@ -404,7 +410,13 @@ static void heap_mark(visitor_t *visitor, obj_t *obj) } return; //Postpone copying } - //HEAP_DBG("Got old object\n"); + + /* Allocate old space on demand */ + if (!heap->old.mem) { + void *old_mem = mem_alloc(OLD_SIZE); + space_init(&heap->old, old_mem, OLD_SIZE); + } + new_pos = space_copy(&heap->old, p, ts); heap_remember(heap, new_pos); hdr->remembered = 0; @@ -431,7 +443,7 @@ static void* heap_allocator_alloc(allocator_t *al, size_t size, int type_id) void heap_init(heap_t *heap, vm_thread_t *thread) { - heap->mem_size = FRESH_SIZE+SURVIVED_SIZE*2+OLD_SIZE; + heap->mem_size = FRESH_SIZE+SURVIVED_SIZE*2; heap->mem = mem_alloc(heap->mem_size); void *memp = heap->mem; @@ -446,7 +458,6 @@ void heap_init(heap_t *heap, vm_thread_t *thread) INIT_SPACE(&heap->fresh, FRESH_SIZE); INIT_SPACE(&heap->survived_spaces[0], SURVIVED_SIZE); INIT_SPACE(&heap->survived_spaces[1], SURVIVED_SIZE); - INIT_SPACE(&heap->old, OLD_SIZE); heap->visitor.visit = heap_mark; heap->visitor.user_data = heap; @@ -463,4 +474,8 @@ void heap_destroy(heap_t *heap) heap->gc_count, heap->gc_time.tv_sec, heap->gc_time.tv_usec); + if (heap->old.mem) { + LOG_DBG("%d object remained in the old space\n", heap->old.blocks); + mem_free(heap->old.mem); + } } vm/heap.c @@ -17,7 +17,6 @@ * <http://www.gnu.org/licenses>. */ #include "primitives.h" -#include "posix.h" int t_pair, t_cont; @@ -243,10 +242,6 @@ static native_module_t modules[] = { { strings_init, strings_cleanup }, { struct_init }, { bytevector_init }, - { posix_init }, -#ifdef HAVE_LIBFFI - { ffi_init, ffi_cleanup } -#endif }; void primitives_init() vm/primitives.c vm/posix.c vm/posix.h 2e454663fe32988ee5381151edbadd0a565d5bf4 Stepan Zastupov redchrom@gmail.com http://github.com/redchrom/lgears/commit/8dd366dae00f7f76478aed32c4d048bb45e88b23 8dd366dae00f7f76478aed32c4d048bb45e88b23 2009-06-23T12:59:32-07:00 2009-06-23T12:59:32-07:00 Delete builtin posix support, allocate old space on demand Builtin posix layer removed because it's a bad idea to hardcode os layer inside VM, in any case, ffi will cover it in future. 4a11d2960b6278e62d30f8037be6483f740403ca Stepan Zastupov redchrom@gmail.com