mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
649bfbe00d
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>)
44 lines
1.4 KiB
C
44 lines
1.4 KiB
C
#include "ruby/ruby.h"
|
|
#include "ruby/debug.h"
|
|
|
|
#define MAX_BUF_SIZE 0x100
|
|
|
|
static VALUE
|
|
profile_frames(VALUE self, VALUE start_v, VALUE num_v)
|
|
{
|
|
int i, collected_size;
|
|
int start = NUM2INT(start_v);
|
|
int buff_size = NUM2INT(num_v);
|
|
VALUE buff[MAX_BUF_SIZE];
|
|
int lines[MAX_BUF_SIZE];
|
|
VALUE result = rb_ary_new();
|
|
|
|
if (buff_size > MAX_BUF_SIZE) rb_raise(rb_eRuntimeError, "too long buff_size");
|
|
|
|
collected_size = rb_profile_frames(start, buff_size, buff, lines);
|
|
|
|
for (i=0; i<collected_size; i++) {
|
|
VALUE ary = rb_ary_new();
|
|
rb_ary_push(ary, rb_profile_frame_path(buff[i]));
|
|
rb_ary_push(ary, rb_profile_frame_absolute_path(buff[i]));
|
|
rb_ary_push(ary, rb_profile_frame_label(buff[i]));
|
|
rb_ary_push(ary, rb_profile_frame_base_label(buff[i]));
|
|
rb_ary_push(ary, rb_profile_frame_full_label(buff[i]));
|
|
rb_ary_push(ary, rb_profile_frame_first_lineno(buff[i]));
|
|
rb_ary_push(ary, rb_profile_frame_classpath(buff[i]));
|
|
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);
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
void
|
|
Init_profile_frames(VALUE klass)
|
|
{
|
|
rb_define_module_function(klass, "profile_frames", profile_frames, 2);
|
|
}
|