diff options
author | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-11-19 06:07:06 +0000 |
---|---|---|
committer | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-11-19 06:07:06 +0000 |
commit | 15d940b8b0361925e15f412913f346fca4bf3400 (patch) | |
tree | ccf8f87f25f960b7cb90687a9e52af6f1d9072c9 /thread.c | |
parent | 3918bbfac493d7c83371e0491570ea11d53d249a (diff) | |
download | ruby-15d940b8b0361925e15f412913f346fca4bf3400.tar.gz |
* thread.c: add `Thread#backtrace_locations' method.
This method is similart to `caller_locations' method for
specific method.
And fix to accept `level' and `n' parameters for `Thread#backtrace'
and `Thread#backtrace_locations'.
`caller' (and `caller_locations') do not return `caller' method
frame.
However, `Thread#backtrace' (and `Thread#backtrace_locations')
return `Thread#backtrace' method frame itself
if `Thread.current.backtrace' was called.
* vm_backtrace.c: ditto.
* internal.h: ditto.
* test/ruby/test_backtrace.rb: add tests.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37716 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'thread.c')
-rw-r--r-- | thread.c | 13 |
1 files changed, 10 insertions, 3 deletions
@@ -4623,9 +4623,15 @@ rb_exec_recursive_outer(VALUE (*func) (VALUE, VALUE, int), VALUE obj, VALUE arg) */ static VALUE -rb_thread_backtrace_m(VALUE thval) +rb_thread_backtrace_m(int argc, VALUE *argv, VALUE thval) { - return rb_thread_backtrace(thval); + return vm_thread_backtrace(argc, argv, thval); +} + +static VALUE +rb_thread_backtrace_locations_m(int argc, VALUE *argv, VALUE thval) +{ + return vm_thread_backtrace_locations(argc, argv, thval); } /* @@ -4705,7 +4711,8 @@ Init_Thread(void) rb_define_method(rb_cThread, "abort_on_exception=", rb_thread_abort_exc_set, 1); rb_define_method(rb_cThread, "safe_level", rb_thread_safe_level, 0); rb_define_method(rb_cThread, "group", rb_thread_group, 0); - rb_define_method(rb_cThread, "backtrace", rb_thread_backtrace_m, 0); + rb_define_method(rb_cThread, "backtrace", rb_thread_backtrace_m, -1); + rb_define_method(rb_cThread, "backtrace_locations", rb_thread_backtrace_locations_m, -1); rb_define_method(rb_cThread, "inspect", rb_thread_inspect, 0); |