From f6cd582505429fa95a4cf697507d8f39959f48d1 Mon Sep 17 00:00:00 2001 From: normal Date: Sat, 30 May 2015 00:20:15 +0000 Subject: variable.c: avoid compatibility table with generic ivars This recovers and improves performance of Marshal.dump/load on Time objects compared to when we implemented generic ivars entirely using st_table. This also recovers some performance on other generic ivar objects, but does not bring bring Marshal.dump/load performance up to previous speeds. benchmark results: minimum results in each 10 measurements. Execution time (sec) name trunk geniv after marshal_dump_flo 0.343 0.334 0.335 marshal_dump_load_geniv 0.487 0.527 0.495 marshal_dump_load_time 1.262 1.401 1.257 Speedup ratio: compare with the result of `trunk' (greater is better) name geniv after marshal_dump_flo 1.026 1.023 marshal_dump_load_geniv 0.925 0.985 marshal_dump_load_time 0.901 1.004 * include/ruby/intern.h (rb_generic_ivar_table): deprecate * internal.h (rb_attr_delete): declare * marshal.c (has_ivars): use rb_ivar_foreach (w_ivar): ditto (w_object): update for new interface * time.c (time_mload): use rb_attr_delete * variable.c (generic_ivar_delete): implement (rb_ivar_delete): ditto (rb_attr_delete): ditto [ruby-core:69323] [Feature #11170] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50680 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- time.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'time.c') diff --git a/time.c b/time.c index 382dc3f108..0d696ba68c 100644 --- a/time.c +++ b/time.c @@ -4735,16 +4735,13 @@ time_mload(VALUE time, VALUE str) long nsec; VALUE submicro, nano_num, nano_den, offset, zone; wideval_t timew; - st_data_t data; time_modify(time); #define get_attr(attr, iffound) \ - attr = rb_attr_get(str, id_##attr); \ + attr = rb_attr_delete(str, id_##attr); \ if (!NIL_P(attr)) { \ - data = id_##attr; \ iffound; \ - st_delete(rb_generic_ivar_table(str), &data, 0); \ } get_attr(nano_num, {}); -- cgit v1.2.3