diff options
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | load.c | 8 | ||||
-rw-r--r-- | vm.c | 3 |
3 files changed, 15 insertions, 4 deletions
@@ -1,3 +1,11 @@ +Tue Dec 3 17:11:47 2013 Aman Gupta <ruby@tmm1.net> + + * load.c (features_index_add_single): Move loaded_features_index array values off + the ruby heap. [Bug #9201] [ruby-core:58805] + * load.c (loaded_features_index_clear_i): Clean up off-heap array structure. + * vm.c (rb_vm_mark): Remove unnecessary mark_tbl for loaded_features_index. + This improves minor GC time by 15% in a large application. + Tue Dec 3 17:01:45 2013 Aman Gupta <ruby@tmm1.net> * include/ruby/ruby.h (struct RClass): Add wrapper struct around @@ -203,7 +203,8 @@ features_index_add_single(VALUE short_feature, VALUE offset) VALUE feature_indexes[2]; feature_indexes[0] = this_feature_index; feature_indexes[1] = offset; - this_feature_index = rb_ary_tmp_new(numberof(feature_indexes)); + this_feature_index = (VALUE)xcalloc(1, sizeof(struct RArray)); + RBASIC(this_feature_index)->flags = T_ARRAY; /* fake VALUE, do not mark/sweep */ rb_ary_cat(this_feature_index, feature_indexes, numberof(feature_indexes)); st_insert(features_index, (st_data_t)short_feature_cstr, (st_data_t)this_feature_index); } @@ -263,6 +264,11 @@ features_index_add(VALUE feature, VALUE offset) static int loaded_features_index_clear_i(st_data_t key, st_data_t val, st_data_t arg) { + VALUE obj = (VALUE)val; + if (!SPECIAL_CONST_P(obj)) { + rb_ary_free(obj); + xfree((void *)obj); + } xfree((char *)key); return ST_DELETE; } @@ -1612,9 +1612,6 @@ rb_vm_mark(void *ptr) if (vm->loading_table) { rb_mark_tbl(vm->loading_table); } - if (vm->loaded_features_index) { - rb_mark_tbl(vm->loaded_features_index); - } rb_vm_trace_mark_event_hooks(&vm->event_hooks); |