conservatory
/
picrin
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cleanup

This commit is contained in:
Yuichi Nishiwaki 2015-07-16 17:23:29 +09:00
parent fae4e28396
commit da0c9d2594
1 changed files with 8 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
extlib/benz/gc.c
View File

@ -258,18 +258,6 @@ heap_morecore(pic_state *pic)
static void gc_mark_object(pic_state *, union object *); static void gc_mark_object(pic_state *, union object *);
static bool
gc_obj_is_marked(struct pic_object *obj)
{
return obj->gc_mark == PIC_GC_MARK;
}
static void
gc_unmark_object(struct pic_object *obj)
{
obj->gc_mark = PIC_GC_UNMARK;
}
static void static void
gc_mark(pic_state *pic, pic_value v) gc_mark(pic_state *pic, pic_value v)
{ {
@ -286,6 +274,7 @@ gc_mark_object(pic_state *pic, union object *obj)
if (obj->obj.gc_mark == PIC_GC_MARK) if (obj->obj.gc_mark == PIC_GC_MARK)
return; return;
obj->obj.gc_mark = PIC_GC_MARK; obj->obj.gc_mark = PIC_GC_MARK;
#define LOOP(o) obj = (union object *)(o); goto loop #define LOOP(o) obj = (union object *)(o); goto loop
@ -539,8 +528,8 @@ gc_mark_phase(pic_state *pic)
continue; continue;
key = kh_key(h, it); key = kh_key(h, it);
val = kh_val(h, it); val = kh_val(h, it);
if (gc_obj_is_marked(key)) { if (key->gc_mark == PIC_GC_MARK) {
if (pic_obj_p(val) && ! gc_obj_is_marked(pic_obj_ptr(val))) { if (pic_obj_p(val) && pic_obj_ptr(val)->gc_mark == PIC_GC_UNMARK) {
gc_mark(pic, val); gc_mark(pic, val);
++j; ++j;
} }
@ -671,6 +660,7 @@ gc_sweep_phase(pic_state *pic)
khash_t(reg) *h; khash_t(reg) *h;
khash_t(s) *s = &pic->syms; khash_t(s) *s = &pic->syms;
pic_sym *sym; pic_sym *sym;
struct pic_object *obj;
size_t total = 0, inuse = 0; size_t total = 0, inuse = 0;
/* registries */ /* registries */
@ -679,7 +669,8 @@ gc_sweep_phase(pic_state *pic)
for (it = kh_begin(h); it != kh_end(h); ++it) { for (it = kh_begin(h); it != kh_end(h); ++it) {
if (! kh_exist(h, it)) if (! kh_exist(h, it))
continue; continue;
if (! gc_obj_is_marked(kh_key(h, it))) { obj = kh_key(h, it);
if (obj->gc_mark == PIC_GC_UNMARK) {
kh_del(reg, h, it); kh_del(reg, h, it);
} }
} }
@ -691,7 +682,7 @@ gc_sweep_phase(pic_state *pic)
if (! kh_exist(s, it)) if (! kh_exist(s, it))
continue; continue;
sym = kh_val(s, it); sym = kh_val(s, it);
if (! gc_obj_is_marked((struct pic_object *)sym)) { if (sym->gc_mark == PIC_GC_UNMARK) {
kh_del(s, s, it); kh_del(s, s, it);
} }
} }
@ -739,7 +730,7 @@ pic_obj_alloc_unsafe(pic_state *pic, size_t size, enum pic_tt tt)
pic_panic(pic, "GC memory exhausted"); pic_panic(pic, "GC memory exhausted");
} }
} }
gc_unmark_object(obj); obj->gc_mark = PIC_GC_UNMARK;
obj->tt = tt; obj->tt = tt;
return obj; return obj;