Skip to content

Implement class hierarchy method caching #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
haileys merged 6 commits into from
Oct 23, 2013
Merged

Implement class hierarchy method caching #4

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
756d555
* class.c, compile.c, eval.c, gc.h, insns.def, internal.h, method.h,
Sep 25, 2013
0864cb9
* vm_insnhelper.c (vm_search_method): no need to check klass == ci->k…
Sep 4, 2013
866edf4
* vm_insnhelper.c (vm_search_method): no need to check klass == ci->k…
Sep 25, 2013
d4aeb9f
* class.c (class_alloc): remove mc_tbl
Sep 25, 2013
7136ab4
* gc.c (free_method_cache_entry_i): unused function
Sep 25, 2013
822a288
merge conflict fail
Sep 25, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
* gc.c (free_method_cache_entry_i): unused function 
* gc.c (rb_free_mc_table): ditto

* internal.h (method_cache_entry_t): unused struct

* vm_method.c (verify_method_cache): remove unused variable

* vm_method.c (rb_method_entry): ditto

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43028 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

Conflicts:
	ChangeLog
  • Loading branch information
Charlie Somerville committed Oct 23, 2013
commit 7136ab40cc1e2f564eeaf4d0dd2dea94601d0a8e
14 changes: 0 additions & 14 deletions gc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -807,20 +807,6 @@ rb_free_m_table(st_table *tbl)
st_free_table(tbl);
}

static int
free_method_cache_entry_i(ID key, method_cache_entry_t *entry, st_data_t data)
{
free(entry);
return ST_CONTINUE;
}

void
rb_free_mc_table(st_table *tbl)
{
st_foreach(tbl, free_method_cache_entry_i, 0);
st_free_table(tbl);
}

static int
free_const_entry_i(ID key, rb_const_entry_t *ce, st_data_t data)
{
Expand Down
10 changes: 0 additions & 10 deletions internal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,16 +46,6 @@ struct rb_subclass_entry {
typedef unsigned long long vm_state_version_t;
#endif

struct rb_method_entry_struct;

typedef struct method_cache_entry {
vm_state_version_t vm_state;
vm_state_version_t seq;
ID mid;
VALUE defined_class;
struct rb_method_entry_struct *me;
} method_cache_entry_t;

struct rb_classext_struct {
VALUE super;
struct st_table *iv_tbl;
Expand Down
4 changes: 0 additions & 4 deletions vm_method.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -542,7 +542,6 @@ static void
verify_method_cache(VALUE klass, ID id, VALUE defined_class, rb_method_entry_t *me)
{
VALUE actual_defined_class;
method_cache_entry_t ent;
rb_method_entry_t *actual_me =
rb_method_entry_get_without_cache(klass, id, &actual_defined_class);

Expand All @@ -568,9 +567,6 @@ rb_method_entry(VALUE klass, ID id, VALUE *defined_class_ptr)
#endif
return ent->me;
}
#else
method_cache_entry_t ent_;
method_cache_entry_t* ent = &ent_;
#endif

return rb_method_entry_get_without_cache(klass, id, defined_class_ptr);
Expand Down