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

* thread.c (rb_exec_recursive): use Hash instead of Array for

Browse Source 
performance improvement.  [ruby-core:13898]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2007-12-07 03:22:28 +00:00
parent 0f8e9a24c1
commit ff2ec563b2
2 changed files with 24 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Fri Dec 7 12:22:26 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* thread.c (rb_exec_recursive): use Hash instead of Array for
performance improvement. [ruby-core:13898]
Thu Dec 6 19:52:50 2007 Yukihiro Matsumoto <matz@ruby-lang.org> Thu Dec 6 19:52:50 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
* parse.y (arg): typo fixed ("!" -> "|") in the ripper code. * parse.y (arg): typo fixed ("!" -> "|") in the ripper code.

37
thread.c
View File

@ -2583,26 +2583,25 @@ rb_barrier_release(VALUE self)
static ID recursive_key; static ID recursive_key;
static VALUE static VALUE
recursive_check(VALUE obj) recursive_check(VALUE hash, VALUE obj)
{ {
VALUE hash = rb_thread_local_aref(rb_thread_current(), recursive_key);
if (NIL_P(hash) || TYPE(hash) != T_HASH) { if (NIL_P(hash) || TYPE(hash) != T_HASH) {
return Qfalse; return Qfalse;
} }
else { else {
VALUE list = rb_hash_aref(hash, ID2SYM(rb_frame_this_func())); VALUE list = rb_hash_aref(hash, ID2SYM(rb_frame_this_func()));
if (NIL_P(list) || TYPE(list) != T_ARRAY) if (NIL_P(list) || TYPE(list) != T_HASH)
return Qfalse; return Qfalse;
return rb_ary_includes(list, rb_obj_id(obj)); if (NIL_P(rb_hash_lookup(list, rb_obj_id(obj))))
return Qfalse;
return Qtrue;
} }
} }
static void static VALUE
recursive_push(VALUE obj) recursive_push(VALUE hash, VALUE obj)
{ {
VALUE hash = rb_thread_local_aref(rb_thread_current(), recursive_key);
VALUE list, sym; VALUE list, sym;
sym = ID2SYM(rb_frame_this_func()); sym = ID2SYM(rb_frame_this_func());
@ -2614,17 +2613,17 @@ recursive_push(VALUE obj)
else { else {
list = rb_hash_aref(hash, sym); list = rb_hash_aref(hash, sym);
} }
if (NIL_P(list) || TYPE(list) != T_ARRAY) { if (NIL_P(list) || TYPE(list) != T_HASH) {
list = rb_ary_new(); list = rb_hash_new();
rb_hash_aset(hash, sym, list); rb_hash_aset(hash, sym, list);
} }
rb_ary_push(list, rb_obj_id(obj)); rb_hash_aset(list, rb_obj_id(obj), Qtrue);
return hash;
} }
static void static void
recursive_pop(void) recursive_pop(VALUE hash, VALUE obj)
{ {
VALUE hash = rb_thread_local_aref(rb_thread_current(), recursive_key);
VALUE list, sym; VALUE list, sym;
sym = ID2SYM(rb_frame_this_func()); sym = ID2SYM(rb_frame_this_func());
@ -2638,32 +2637,34 @@ recursive_pop(void)
StringValuePtr(symname), StringValuePtr(thrname)); StringValuePtr(symname), StringValuePtr(thrname));
} }
list = rb_hash_aref(hash, sym); list = rb_hash_aref(hash, sym);
if (NIL_P(list) || TYPE(list) != T_ARRAY) { if (NIL_P(list) || TYPE(list) != T_HASH) {
VALUE symname = rb_inspect(sym); VALUE symname = rb_inspect(sym);
VALUE thrname = rb_inspect(rb_thread_current()); VALUE thrname = rb_inspect(rb_thread_current());
rb_raise(rb_eTypeError, "invalid inspect_tbl list for %s in %s", rb_raise(rb_eTypeError, "invalid inspect_tbl list for %s in %s",
StringValuePtr(symname), StringValuePtr(thrname)); StringValuePtr(symname), StringValuePtr(thrname));
} }
rb_ary_pop(list); rb_hash_delete(list, obj);
} }
VALUE VALUE
rb_exec_recursive(VALUE (*func) (VALUE, VALUE, int), VALUE obj, VALUE arg) rb_exec_recursive(VALUE (*func) (VALUE, VALUE, int), VALUE obj, VALUE arg)
{ {
if (recursive_check(obj)) { VALUE hash = rb_thread_local_aref(rb_thread_current(), recursive_key);
if (recursive_check(hash, obj)) {
return (*func) (obj, arg, Qtrue); return (*func) (obj, arg, Qtrue);
} }
else { else {
VALUE result = Qundef; VALUE result = Qundef;
int state; int state;
recursive_push(obj); hash = recursive_push(hash, obj);
PUSH_TAG(); PUSH_TAG();
if ((state = EXEC_TAG()) == 0) { if ((state = EXEC_TAG()) == 0) {
result = (*func) (obj, arg, Qfalse); result = (*func) (obj, arg, Qfalse);
} }
POP_TAG(); POP_TAG();
recursive_pop(); recursive_pop(hash, obj);
if (state) if (state)
JUMP_TAG(state); JUMP_TAG(state);
return result; return result;