1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ruby.h: swap iv_index_tbl and super for struct RClass

Browse Source 
* include/ruby/ruby.h (struct RClass): add super, remove iv_index_tbl.
  since RCLASS_SUPER() is commonly used inside while loops, we move it
  back inside struct RClass to improve cache hits. this provides a
  small improvement (1%) in hotspots like rb_obj_is_kind_of()
* internal.h (struct rb_classext_struct): remove super, add
  iv_index_table
* internal.h (RCLASS_SUPER): update for new location
* internal.h (RCLASS_SET_SUPER): ditto
* internal.h (RCLASS_IV_INDEX_TBL): ditto
* object.c (rb_class_get_superclass): ditto
* include/ruby/backward/classext.h (RCLASS_SUPER): ditto

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44294 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
tmm1 2013-12-20 05:10:07 +00:00
parent 41c42afdda
commit 3409690957
5 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ChangeLog
View File

@ -1,3 +1,17 @@
Fri Dec 20 14:00:01 2013 Aman Gupta <ruby@tmm1.net>
* include/ruby/ruby.h (struct RClass): add super, remove iv_index_tbl.
since RCLASS_SUPER() is commonly used inside while loops, we move it
back inside struct RClass to improve cache hits. this provides a
small improvement (1%) in hotspots like rb_obj_is_kind_of()
* internal.h (struct rb_classext_struct): remove super, add
iv_index_table
* internal.h (RCLASS_SUPER): update for new location
* internal.h (RCLASS_SET_SUPER): ditto
* internal.h (RCLASS_IV_INDEX_TBL): ditto
* object.c (rb_class_get_superclass): ditto
* include/ruby/backward/classext.h (RCLASS_SUPER): ditto
Fri Dec 20 07:07:35 2013 Eric Hodel <drbrain@segment7.net> Fri Dec 20 07:07:35 2013 Eric Hodel <drbrain@segment7.net>
* lib/rubygems: Update to RubyGems master 03d6ae7. Changes include: * lib/rubygems: Update to RubyGems master 03d6ae7. Changes include:

2
include/ruby/backward/classext.h
View File

@ -13,6 +13,6 @@ typedef struct rb_deprecated_classext_struct {
#undef RCLASS_SUPER(c) #undef RCLASS_SUPER(c)
#define RCLASS_EXT(c) ((rb_deprecated_classext_t *)RCLASS(c)->ptr) #define RCLASS_EXT(c) ((rb_deprecated_classext_t *)RCLASS(c)->ptr)
#define RCLASS_SUPER(c) (RCLASS_EXT(c)->super) #define RCLASS_SUPER(c) (RCLASS(c)->super)
#endif /* RUBY_BACKWARD_CLASSEXT_H */ #endif /* RUBY_BACKWARD_CLASSEXT_H */

2
include/ruby/ruby.h
View File

@ -789,9 +789,9 @@ typedef struct rb_classext_struct rb_classext_t;
struct RClass { struct RClass {
struct RBasic basic; struct RBasic basic;
VALUE super;
rb_classext_t *ptr; rb_classext_t *ptr;
struct method_table_wrapper *m_tbl_wrapper; struct method_table_wrapper *m_tbl_wrapper;
struct st_table *iv_index_tbl;
}; };
#define RCLASS_SUPER(c) rb_class_get_superclass(c) #define RCLASS_SUPER(c) rb_class_get_superclass(c)
#define RMODULE_IV_TBL(m) RCLASS_IV_TBL(m) #define RMODULE_IV_TBL(m) RCLASS_IV_TBL(m)

8
internal.h
View File

@ -262,7 +262,7 @@ typedef unsigned long rb_serial_t;
#endif #endif
struct rb_classext_struct { struct rb_classext_struct {
VALUE super; struct st_table *iv_index_tbl;
struct st_table *iv_tbl; struct st_table *iv_tbl;
struct st_table *const_tbl; struct st_table *const_tbl;
rb_subclass_entry_t *subclasses; rb_subclass_entry_t *subclasses;
@ -293,7 +293,7 @@ void rb_class_remove_from_super_subclasses(VALUE);
#define RCLASS_CONST_TBL(c) (RCLASS_EXT(c)->const_tbl) #define RCLASS_CONST_TBL(c) (RCLASS_EXT(c)->const_tbl)
#define RCLASS_M_TBL_WRAPPER(c) (RCLASS(c)->m_tbl_wrapper) #define RCLASS_M_TBL_WRAPPER(c) (RCLASS(c)->m_tbl_wrapper)
#define RCLASS_M_TBL(c) (RCLASS_M_TBL_WRAPPER(c) ? RCLASS_M_TBL_WRAPPER(c)->tbl : 0) #define RCLASS_M_TBL(c) (RCLASS_M_TBL_WRAPPER(c) ? RCLASS_M_TBL_WRAPPER(c)->tbl : 0)
#define RCLASS_IV_INDEX_TBL(c) (RCLASS(c)->iv_index_tbl) #define RCLASS_IV_INDEX_TBL(c) (RCLASS_EXT(c)->iv_index_tbl)
#define RCLASS_ORIGIN(c) (RCLASS_EXT(c)->origin) #define RCLASS_ORIGIN(c) (RCLASS_EXT(c)->origin)
#define RCLASS_REFINED_CLASS(c) (RCLASS_EXT(c)->refined_class) #define RCLASS_REFINED_CLASS(c) (RCLASS_EXT(c)->refined_class)
#define RCLASS_SERIAL(c) (RCLASS_EXT(c)->class_serial) #define RCLASS_SERIAL(c) (RCLASS_EXT(c)->class_serial)
@ -312,7 +312,7 @@ RCLASS_M_TBL_INIT(VALUE c)
static inline VALUE static inline VALUE
RCLASS_SUPER(VALUE klass) RCLASS_SUPER(VALUE klass)
{ {
return RCLASS_EXT(klass)->super; return RCLASS(klass)->super;
} }
static inline VALUE static inline VALUE
@ -322,7 +322,7 @@ RCLASS_SET_SUPER(VALUE klass, VALUE super)
rb_class_remove_from_super_subclasses(klass); rb_class_remove_from_super_subclasses(klass);
rb_class_subclass_add(super, klass); rb_class_subclass_add(super, klass);
} }
OBJ_WRITE(klass, &RCLASS_EXT(klass)->super, super); OBJ_WRITE(klass, &RCLASS(klass)->super, super);
return super; return super;
} }

2
object.c
View File

@ -1884,7 +1884,7 @@ rb_class_superclass(VALUE klass)
VALUE VALUE
rb_class_get_superclass(VALUE klass) rb_class_get_superclass(VALUE klass)
{ {
return RCLASS_EXT(klass)->super; return RCLASS(klass)->super;
} }
#define id_for_setter(name, type, message) \ #define id_for_setter(name, type, message) \