diff options
author | Ivo Anjo <ivo.anjo@datadoghq.com> | 2022-07-11 14:51:44 +0100 |
---|---|---|
committer | Yusuke Endoh <mame@ruby-lang.org> | 2022-07-26 10:43:44 +0900 |
commit | 649bfbe00d8032fa2c0536e596a284f69926e87f (patch) | |
tree | 099c44d7ccbf253380d254e0e2b7eb5d9ec19bb1 /ext/-test- | |
parent | cc29b43c7a8079c0c9e308f049390dfaab5acbd9 (diff) |
Fix `rb_profile_frames` output includes dummy main thread frame
The `rb_profile_frames` API did not skip the two dummy frames that
each thread has at its beginning. This was unlike `backtrace_each` and
`rb_ec_parcial_backtrace_object`, which do skip them.
This does not seem to be a problem for non-main thread frames,
because both `VM_FRAME_RUBYFRAME_P(cfp)` and
`rb_vm_frame_method_entry(cfp)` are NULL for them.
BUT, on the main thread `VM_FRAME_RUBYFRAME_P(cfp)` was true
and thus the dummy thread was still included in the output of
`rb_profile_frames`.
I've now made `rb_profile_frames` skip this extra frame (like
`backtrace_each` and friends), as well as add a test that asserts
the size and contents of `rb_profile_frames`.
Fixes [Bug #18907] (<https://bugs.ruby-lang.org/issues/18907>)
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/6114
Diffstat (limited to 'ext/-test-')
-rw-r--r-- | ext/-test-/debug/profile_frames.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ext/-test-/debug/profile_frames.c b/ext/-test-/debug/profile_frames.c index 5f14755ce7..d2bba7d183 100644 --- a/ext/-test-/debug/profile_frames.c +++ b/ext/-test-/debug/profile_frames.c @@ -29,6 +29,7 @@ profile_frames(VALUE self, VALUE start_v, VALUE num_v) rb_ary_push(ary, rb_profile_frame_singleton_method_p(buff[i])); rb_ary_push(ary, rb_profile_frame_method_name(buff[i])); rb_ary_push(ary, rb_profile_frame_qualified_method_name(buff[i])); + rb_ary_push(ary, INT2NUM(lines[i])); rb_ary_push(result, ary); } |