From e5054226b4f9ddedb97d184698310fa8587a32b4 Mon Sep 17 00:00:00 2001 From: mame Date: Thu, 28 Jul 2011 16:25:23 +0000 Subject: * backport r32671 from trunk. * proc.c: pre-allocate the unlinked_method_entry_list_entry struct to avoid memory allocation during GC. based on a patch from Eric Wong. [ruby-core:38498] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@32729 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 8 ++++++++ proc.c | 10 +++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 419a7803bc..4b276d6dfb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Mon Jul 25 23:51:01 2011 Yusuke Endoh + + * backport r32671 from trunk. + + * proc.c: pre-allocate the unlinked_method_entry_list_entry struct to + avoid memory allocation during GC. based on a patch from Eric Wong. + [ruby-core:38498] + Mon Jul 25 22:36:11 2011 Yusuke Endoh * backport r32669 from trunk. diff --git a/proc.c b/proc.c index 3f175cc324..427d1fe744 100644 --- a/proc.c +++ b/proc.c @@ -19,6 +19,7 @@ struct METHOD { VALUE rclass; ID id; rb_method_entry_t *me; + struct unlinked_method_entry_list_entry *ume; }; VALUE rb_cUnboundMethod; @@ -867,7 +868,10 @@ static void bm_free(void *ptr) { struct METHOD *data = ptr; - rb_unlink_method_entry(data->me); + struct unlinked_method_entry_list_entry *ume = data->ume; + ume->me = data->me; + ume->next = GET_VM()->unlinked_method_entry_list; + GET_VM()->unlinked_method_entry_list = ume; xfree(ptr); } @@ -976,6 +980,7 @@ mnew(VALUE klass, VALUE obj, ID id, VALUE mclass, int scope) data->me = ALLOC(rb_method_entry_t); *data->me = *me; data->me->def->alias_count++; + data->ume = ALLOC(struct unlinked_method_entry_list_entry); OBJ_INFECT(method, klass); @@ -1084,6 +1089,7 @@ method_unbind(VALUE obj) *data->me = *orig->me; if (orig->me->def) orig->me->def->alias_count++; data->rclass = orig->rclass; + data->ume = ALLOC(struct unlinked_method_entry_list_entry); OBJ_INFECT(method, obj); return method; @@ -1383,6 +1389,7 @@ method_clone(VALUE self) data->me = ALLOC(rb_method_entry_t); *data->me = *orig->me; if (data->me->def) data->me->def->alias_count++; + data->ume = ALLOC(struct unlinked_method_entry_list_entry); return clone; } @@ -1549,6 +1556,7 @@ umethod_bind(VALUE method, VALUE recv) if (bound->me->def) bound->me->def->alias_count++; bound->recv = recv; bound->rclass = CLASS_OF(recv); + data->ume = ALLOC(struct unlinked_method_entry_list_entry); return method; } -- cgit v1.2.3