diff options
Diffstat (limited to 'gc.c')
| -rw-r--r-- | gc.c | 33 |
1 files changed, 26 insertions, 7 deletions
@@ -1414,12 +1414,21 @@ free_method_entry_i(ID key, rb_method_entry_t *me, st_data_t data) } void -rb_free_m_table(st_table *tbl) +rb_free_m_tbl(st_table *tbl) { st_foreach(tbl, free_method_entry_i, 0); st_free_table(tbl); } +void +rb_free_m_tbl_wrapper(struct method_table_wrapper *wrapper) +{ + if (wrapper->tbl) { + rb_free_m_tbl(wrapper->tbl); + } + xfree(wrapper); +} + static int free_const_entry_i(ID key, rb_const_entry_t *ce, st_data_t data) { @@ -1484,8 +1493,8 @@ obj_free(rb_objspace_t *objspace, VALUE obj) break; case T_MODULE: case T_CLASS: - if (RCLASS_M_TBL(obj)) { - rb_free_m_table(RCLASS_M_TBL(obj)); + if (RCLASS_M_TBL_WRAPPER(obj)) { + rb_free_m_tbl_wrapper(RCLASS_M_TBL_WRAPPER(obj)); } if (RCLASS_IV_TBL(obj)) { st_free_table(RCLASS_IV_TBL(obj)); @@ -2393,6 +2402,9 @@ obj_memsize_of(VALUE obj, int use_tdata) break; case T_MODULE: case T_CLASS: + if (RCLASS_M_TBL_WRAPPER(obj)) { + size += sizeof(struct method_table_wrapper); + } if (RCLASS_M_TBL(obj)) { size += st_memsize(RCLASS_M_TBL(obj)); } @@ -3368,12 +3380,19 @@ mark_method_entry_i(ID key, const rb_method_entry_t *me, st_data_t data) } static void -mark_m_tbl(rb_objspace_t *objspace, st_table *tbl) +mark_m_tbl_wrapper(rb_objspace_t *objspace, struct method_table_wrapper *wrapper) { struct mark_tbl_arg arg; - if (!tbl) return; + if (!wrapper || !wrapper->tbl) return; + if (LIKELY(objspace->mark_func_data == 0)) { + /* prevent multiple marking during same GC cycle, + * since m_tbl is shared between several T_ICLASS */ + size_t serial = rb_gc_count(); + if (wrapper->serial == serial) return; + wrapper->serial = serial; + } arg.objspace = objspace; - st_foreach(tbl, mark_method_entry_i, (st_data_t)&arg); + st_foreach(wrapper->tbl, mark_method_entry_i, (st_data_t)&arg); } static int @@ -3787,7 +3806,7 @@ gc_mark_children(rb_objspace_t *objspace, VALUE ptr) case T_ICLASS: case T_CLASS: case T_MODULE: - mark_m_tbl(objspace, RCLASS_M_TBL(obj)); + mark_m_tbl_wrapper(objspace, RCLASS_M_TBL_WRAPPER(obj)); if (!RCLASS_EXT(obj)) break; mark_tbl(objspace, RCLASS_IV_TBL(obj)); mark_const_tbl(objspace, RCLASS_CONST_TBL(obj)); |