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

* vm_method.c (rb_clear_cache*): update only vm state version.

Browse Source 
* vm_method.c (rb_method_entry_get_without_cache, rb_method_entry):
  Fill method cache entry with vm state version, and
  check current vm state version for method (cache) look up.
  This modification speed-up invaridating of global method cache table.
  [Ruby 1.9 - Feature #3905] [ruby-core:36908]



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32024 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
ko1 2011-06-12 08:53:15 +00:00
parent 483efa1fda
commit 8c09664a94
2 changed files with 14 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
Sun Jun 12 17:40:29 2011 Koichi Sasada <ko1@atdot.net>
* vm_method.c (rb_clear_cache*): update only vm state version.
* vm_method.c (rb_method_entry_get_without_cache, rb_method_entry):
Fill method cache entry with vm state version, and
check current vm state version for method (cache) look up.
This modification speed-up invaridating of global method cache table.
[Ruby 1.9 - Feature #3905] [ruby-core:36908]
Sun Jun 12 16:19:48 2011 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/extconf.rb: fail on Mac OS X. [Bug #4853][ruby-dev:43655]

59
vm_method.c
View File

@ -13,6 +13,7 @@ static ID removed, singleton_removed, undefined, singleton_undefined;
static ID added, singleton_added, attached;
struct cache_entry { /* method hash table. */
VALUE filled_version; /* filled state version */
ID mid; /* method's id */
VALUE klass; /* receiver's class */
rb_method_entry_t *me;
@ -25,79 +26,25 @@ static struct cache_entry cache[CACHE_SIZE];
void
rb_clear_cache(void)
{
struct cache_entry *ent, *end;
rb_vm_change_state();
if (!ruby_running)
return;
ent = cache;
end = ent + CACHE_SIZE;
while (ent < end) {
ent->me = 0;
ent->mid = 0;
ent++;
}
}
static void
rb_clear_cache_for_undef(VALUE klass, ID id)
{
struct cache_entry *ent, *end;
rb_vm_change_state();
if (!ruby_running)
return;
ent = cache;
end = ent + CACHE_SIZE;
while (ent < end) {
if ((ent->me && ent->me->klass == klass) && ent->mid == id) {
ent->me = 0;
ent->mid = 0;
}
ent++;
}
}
static void
rb_clear_cache_by_id(ID id)
{
struct cache_entry *ent, *end;
rb_vm_change_state();
if (!ruby_running)
return;
ent = cache;
end = ent + CACHE_SIZE;
while (ent < end) {
if (ent->mid == id) {
ent->me = 0;
ent->mid = 0;
}
ent++;
}
}
void
rb_clear_cache_by_class(VALUE klass)
{
struct cache_entry *ent, *end;
rb_vm_change_state();
if (!ruby_running)
return;
ent = cache;
end = ent + CACHE_SIZE;
while (ent < end) {
if (ent->klass == klass || (ent->me && ent->me->klass == klass)) {
ent->me = 0;
ent->mid = 0;
}
ent++;
}
}
VALUE
@ -420,6 +367,7 @@ rb_method_entry_get_without_cache(VALUE klass, ID id)
if (ruby_running) {
struct cache_entry *ent;
ent = cache + EXPR1(klass, id);
ent->filled_version = GET_VM_STATE_VERSION();
ent->klass = klass;
if (UNDEFINED_METHOD_ENTRY_P(me)) {
@ -442,7 +390,8 @@ rb_method_entry(VALUE klass, ID id)
struct cache_entry *ent;
ent = cache + EXPR1(klass, id);
if (ent->mid == id && ent->klass == klass) {
if (ent->filled_version == GET_VM_STATE_VERSION() &&
ent->mid == id && ent->klass == klass) {
return ent->me;
}