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

thread.c: reduce tags and stack

Browse Source 
* thread.c: (exec_recursive): use rb_catch_protect() instead of
  rb_catch_obj() and PUSH_TAG(), and reduce pushing tags and
  machine stack usage.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44181 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2013-12-13 15:22:18 +00:00
parent 569ab98704
commit 26d147c733
2 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Sat Dec 14 00:22:16 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* thread.c: (exec_recursive): use rb_catch_protect() instead of
rb_catch_obj() and PUSH_TAG(), and reduce pushing tags and
machine stack usage.
Sat Dec 14 00:18:08 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> Sat Dec 14 00:18:08 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* proc.c (mnew_from_me): achieve the original defined_class from * proc.c (mnew_from_me): achieve the original defined_class from

30
thread.c
View File

@ -4880,19 +4880,7 @@ static VALUE
exec_recursive_i(RB_BLOCK_CALL_FUNC_ARGLIST(tag, data)) exec_recursive_i(RB_BLOCK_CALL_FUNC_ARGLIST(tag, data))
{ {
struct exec_recursive_params *p = (void *)data; struct exec_recursive_params *p = (void *)data;
VALUE result = Qundef; return (*p->func)(p->obj, p->arg, FALSE);
int state;
recursive_push(p->list, p->objid, p->pairid);
PUSH_TAG();
if ((state = EXEC_TAG()) == 0) {
result = (*p->func)(p->obj, p->arg, FALSE);
}
POP_TAG();
recursive_pop(p->list, p->objid, p->pairid);
if (state)
JUMP_TAG(state);
return result;
} }
/* /*
@ -4926,18 +4914,30 @@ exec_recursive(VALUE (*func) (VALUE, VALUE, int), VALUE obj, VALUE pairid, VALUE
return (*func)(obj, arg, TRUE); return (*func)(obj, arg, TRUE);
} }
else { else {
int state;
p.func = func; p.func = func;
if (outermost) { if (outermost) {
recursive_push(p.list, ID2SYM(recursive_key), 0); recursive_push(p.list, ID2SYM(recursive_key), 0);
result = rb_catch_obj(p.list, exec_recursive_i, (VALUE)&p); recursive_push(p.list, p.objid, p.pairid);
result = rb_catch_protect(p.list, exec_recursive_i, (VALUE)&p, &state);
recursive_pop(p.list, p.objid, p.pairid);
recursive_pop(p.list, ID2SYM(recursive_key), 0); recursive_pop(p.list, ID2SYM(recursive_key), 0);
if (state) JUMP_TAG(state);
if (result == p.list) { if (result == p.list) {
result = (*func)(obj, arg, TRUE); result = (*func)(obj, arg, TRUE);
} }
} }
else { else {
result = exec_recursive_i(0, (VALUE)&p, 0, 0, Qnil); recursive_push(p.list, p.objid, p.pairid);
PUSH_TAG();
if ((state = EXEC_TAG()) == 0) {
result = (*func)(obj, arg, FALSE);
}
POP_TAG();
recursive_pop(p.list, p.objid, p.pairid);
if (state) JUMP_TAG(state);
} }
} }
*(volatile struct exec_recursive_params *)&p; *(volatile struct exec_recursive_params *)&p;