diff options
author | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-01-29 08:25:32 +0000 |
---|---|---|
committer | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-01-29 08:25:32 +0000 |
commit | 18e01f63816ec36d10b8d958b8298b73950dd89f (patch) | |
tree | 21cf859454214cadb1f901ff5d119d0d8372418c /vm_backtrace.c | |
parent | 499ca89e24c47cfada7e493a7dfd81cdb9323a45 (diff) | |
download | ruby-18e01f63816ec36d10b8d958b8298b73950dd89f.tar.gz |
* vm_backtrace.c: fix issue of rb_debug_inspector_open().
The order of making binding should be stack (frame) top to bottom.
[Bug #7635]
And also fix issue of collecting klass. Collecting klass is same
as TracePoint#defined_class.
(previous version, it returns T_ICLASS (internal objects).
* test/-ext-/debug/test_debug.rb: add a test.
* ext/-test-/debug/extconf.rb, init.c, inspector.c: ditto.
* vm_backtrace.c: remove magic number and add enum CALLER_BINDING_*.
* vm_backtrace.c, include/ruby/debug.h: add new C api (experimental)
rb_debug_inspector_frame_self_get().
* vm.c, vm_core.h, vm_trace.c: move decl. of
rb_vm_control_frame_id_and_class() and constify first parameter.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38970 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm_backtrace.c')
-rw-r--r-- | vm_backtrace.c | 85 |
1 files changed, 72 insertions, 13 deletions
diff --git a/vm_backtrace.c b/vm_backtrace.c index f22b95c704..15bf1633d9 100644 --- a/vm_backtrace.c +++ b/vm_backtrace.c @@ -1012,8 +1012,15 @@ struct rb_debug_inspector_struct { long backtrace_size; }; +enum { + CALLER_BINDING_SELF, + CALLER_BINDING_CLASS, + CALLER_BINDING_BINDING, + CALLER_BINDING_ISEQ, + CALLER_BINDING_CFP +}; + struct collect_caller_bindings_data { - rb_thread_t *th; VALUE ary; }; @@ -1023,37 +1030,82 @@ collect_caller_bindings_init(void *arg, size_t size) /* */ } +static VALUE +get_klass(const rb_control_frame_t *cfp) +{ + VALUE klass; + if (rb_vm_control_frame_id_and_class(cfp, 0, &klass)) { + if (RB_TYPE_P(klass, T_ICLASS)) { + return RBASIC(klass)->klass; + } + else { + return klass; + } + } + else { + return Qnil; + } +} + static void collect_caller_bindings_iseq(void *arg, const rb_control_frame_t *cfp) { struct collect_caller_bindings_data *data = (struct collect_caller_bindings_data *)arg; - rb_ary_push(data->ary, - rb_ary_new3(4, - cfp->klass, - rb_binding_new_with_cfp(data->th, cfp), - cfp->iseq ? cfp->iseq->self : Qnil, - GC_GUARDED_PTR(cfp))); + VALUE frame = rb_ary_new2(5); + + rb_ary_store(frame, CALLER_BINDING_SELF, cfp->self); + rb_ary_store(frame, CALLER_BINDING_CLASS, get_klass(cfp)); + rb_ary_store(frame, CALLER_BINDING_BINDING, GC_GUARDED_PTR(cfp)); /* create later */ + rb_ary_store(frame, CALLER_BINDING_ISEQ, cfp->iseq ? cfp->iseq->self : Qnil); + rb_ary_store(frame, CALLER_BINDING_CFP, GC_GUARDED_PTR(cfp)); + + rb_ary_push(data->ary, frame); } static void collect_caller_bindings_cfunc(void *arg, const rb_control_frame_t *cfp, ID mid) { struct collect_caller_bindings_data *data = (struct collect_caller_bindings_data *)arg; - rb_ary_push(data->ary, rb_ary_new3(2, cfp->klass, Qnil)); + VALUE frame = rb_ary_new2(5); + + rb_ary_store(frame, CALLER_BINDING_SELF, cfp->self); + rb_ary_store(frame, CALLER_BINDING_CLASS, get_klass(cfp)); + rb_ary_store(frame, CALLER_BINDING_BINDING, Qnil); /* not available */ + rb_ary_store(frame, CALLER_BINDING_ISEQ, Qnil); /* not available */ + rb_ary_store(frame, CALLER_BINDING_CFP, GC_GUARDED_PTR(cfp)); + + rb_ary_push(data->ary, frame); } static VALUE collect_caller_bindings(rb_thread_t *th) { struct collect_caller_bindings_data data; + VALUE result; + int i; + data.ary = rb_ary_new(); - data.th = th; + backtrace_each(th, collect_caller_bindings_init, collect_caller_bindings_iseq, collect_caller_bindings_cfunc, &data); - return rb_ary_reverse(data.ary); + + result = rb_ary_reverse(data.ary); + + /* bindings should be created from top of frame */ + for (i=0; i<RARRAY_LEN(result); i++) { + VALUE entry = rb_ary_entry(result, i); + VALUE cfp_val = rb_ary_entry(entry, CALLER_BINDING_BINDING); + + if (!NIL_P(cfp_val)) { + rb_control_frame_t *cfp = GC_GUARDED_PTR_REF(cfp_val); + rb_ary_store(entry, CALLER_BINDING_BINDING, rb_binding_new_with_cfp(th, cfp)); + } + } + + return result; } /* @@ -1100,24 +1152,31 @@ frame_get(const rb_debug_inspector_t *dc, long index) } VALUE +rb_debug_inspector_frame_self_get(const rb_debug_inspector_t *dc, long index) +{ + VALUE frame = frame_get(dc, index); + return rb_ary_entry(frame, CALLER_BINDING_SELF); +} + +VALUE rb_debug_inspector_frame_class_get(const rb_debug_inspector_t *dc, long index) { VALUE frame = frame_get(dc, index); - return rb_ary_entry(frame, 0); + return rb_ary_entry(frame, CALLER_BINDING_CLASS); } VALUE rb_debug_inspector_frame_binding_get(const rb_debug_inspector_t *dc, long index) { VALUE frame = frame_get(dc, index); - return rb_ary_entry(frame, 1); + return rb_ary_entry(frame, CALLER_BINDING_BINDING); } VALUE rb_debug_inspector_frame_iseq_get(const rb_debug_inspector_t *dc, long index) { VALUE frame = frame_get(dc, index); - return rb_ary_entry(frame, 2); + return rb_ary_entry(frame, CALLER_BINDING_ISEQ); } VALUE |