Fcalva/chibi-scheme
1
0
Fork 0
mirror of https://github.com/ashinn/chibi-scheme.git synced 2025-05-20 14:19:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

separating finalizing from sweeping, delaying finalizing DLs until after other values

Browse source
This commit is contained in:
Alex Shinn 2011-11-08 22:44:31 +09:00
parent 11ff9603ac
commit 865fdbc676
2 changed files with 55 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
gc.c
View file

@ -305,12 +305,58 @@ void sexp_reset_weak_references(sexp ctx) {
#define sexp_reset_weak_references(ctx) #define sexp_reset_weak_references(ctx)
#endif #endif
sexp sexp_finalize (sexp ctx) {
size_t size;
sexp p, t, end;
sexp_free_list q, r;
sexp_proc2 finalizer;
sexp_sint_t finalize_count = 0;
sexp_heap h = sexp_context_heap(ctx);
#if SEXP_USE_DL
sexp_sint_t free_dls = 0, pass = 0;
loop:
#endif
/* scan over the whole heap */
for ( ; h; h=h->next) {
p = sexp_heap_first_block(h);
q = h->free_list;
end = sexp_heap_end(h);
while (p < end) {
/* find the preceding and succeeding free list pointers */
for (r=q->next; r && ((char*)r<(char*)p); q=r, r=r->next)
;
if ((char*)r == (char*)p) { /* this is a free block, skip it */
p = (sexp) (((char*)p) + r->size);
continue;
}
size = sexp_heap_align(sexp_allocated_bytes(ctx, p));
if (!sexp_markedp(p)) {
t = sexp_object_type(ctx, p);
finalizer = sexp_type_finalize(t);
if (finalizer) {
finalize_count++;
#if SEXP_USE_DL
if (sexp_type_tag(t) == SEXP_DL && pass <= 0)
free_dls = 1;
else
#endif
finalizer(ctx, NULL, 1, p);
}
}
p = (sexp) (((char*)p)+size);
}
}
#if SEXP_USE_DL
if (free_dls && pass++ <= 0) goto loop;
#endif
return sexp_make_fixnum(finalize_count);
}
sexp sexp_sweep (sexp ctx, size_t *sum_freed_ptr) { sexp sexp_sweep (sexp ctx, size_t *sum_freed_ptr) {
size_t freed, max_freed=0, sum_freed=0, size; size_t freed, max_freed=0, sum_freed=0, size;
sexp_heap h = sexp_context_heap(ctx); sexp_heap h = sexp_context_heap(ctx);
sexp p, end; sexp p, end;
sexp_free_list q, r, s; sexp_free_list q, r, s;
sexp_proc2 finalizer;
/* scan over the whole heap */ /* scan over the whole heap */
for ( ; h; h=h->next) { for ( ; h; h=h->next) {
p = sexp_heap_first_block(h); p = sexp_heap_first_block(h);
@ -337,8 +383,6 @@ sexp sexp_sweep (sexp ctx, size_t *sum_freed_ptr) {
#endif #endif
if (!sexp_markedp(p)) { if (!sexp_markedp(p)) {
/* free p */ /* free p */
finalizer = sexp_type_finalize(sexp_object_type(ctx, p));
if (finalizer) finalizer(ctx, NULL, 1, p);
sum_freed += size; sum_freed += size;
if (((((char*)q) + q->size) == (char*)p) && (q != h->free_list)) { if (((((char*)q) + q->size) == (char*)p) && (q != h->free_list)) {
/* merge q with p */ /* merge q with p */
@ -391,16 +435,18 @@ void sexp_mark_global_symbols(sexp ctx) {
#endif #endif
sexp sexp_gc (sexp ctx, size_t *sum_freed) { sexp sexp_gc (sexp ctx, size_t *sum_freed) {
sexp res; sexp res, finalized;
sexp_debug_printf("%p (heap: %p size: %lu)", ctx, sexp_context_heap(ctx), sexp_debug_printf("%p (heap: %p size: %lu)", ctx, sexp_context_heap(ctx),
sexp_heap_total_size(sexp_context_heap(ctx))); sexp_heap_total_size(sexp_context_heap(ctx)));
sexp_mark_global_symbols(ctx); sexp_mark_global_symbols(ctx);
sexp_mark(ctx, ctx); sexp_mark(ctx, ctx);
sexp_conservative_mark(ctx); sexp_conservative_mark(ctx);
sexp_reset_weak_references(ctx); sexp_reset_weak_references(ctx);
finalized = sexp_finalize(ctx);
res = sexp_sweep(ctx, sum_freed); res = sexp_sweep(ctx, sum_freed);
sexp_debug_printf("%p (freed: %lu max_freed: %lu)", ctx, sexp_debug_printf("%p (freed: %lu max_freed: %lu finalized: %lu)", ctx,
(sum_freed ? *sum_freed : 0), sexp_unbox_fixnum(res)); (sum_freed ? *sum_freed : 0), sexp_unbox_fixnum(res),
sexp_unbox_fixnum(finalized));
return res; return res;
} }

4
sexp.c
View file

@ -457,7 +457,9 @@ void sexp_destroy_context (sexp ctx) {
sexp_markedp(ctx) = 1; sexp_markedp(ctx) = 1;
sexp_markedp(sexp_context_globals(ctx)) = 1; sexp_markedp(sexp_context_globals(ctx)) = 1;
sexp_mark(ctx, sexp_global(ctx, SEXP_G_TYPES)); sexp_mark(ctx, sexp_global(ctx, SEXP_G_TYPES));
sexp_sweep(ctx, &sum_freed); /* sweep w/o mark to run finalizers */ sexp_finalize(ctx);
sexp_sweep(ctx, &sum_freed);
sexp_finalize(ctx);
sexp_context_heap(ctx) = NULL; sexp_context_heap(ctx) = NULL;
for ( ; heap; heap=tmp) { for ( ; heap; heap=tmp) {
tmp = heap->next; tmp = heap->next;