summaryrefslogtreecommitdiff
path: root/thread.c
diff options
context:
space:
mode:
authorko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-10 16:33:51 +0000
committerko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-10 16:33:51 +0000
commited4139e39bb3ceda2985b2ea2ebd9a91479d25da (patch)
tree5d3dd4ee2335a7dc1fc437e8dd8fc01e4b22774d /thread.c
parent8b7a284b65cdc1ebb71cff34db473af1b17390d1 (diff)
* include/ruby/intern.h, proc.c: revert rb_proc_call() and
create rb_proc_call_with_block() instaed. * include/ruby/ruby.h, eval_jump.c, thread.c, vm_insnhelper.c: rb_blockptr should not be exposed. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@17081 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'thread.c')
-rw-r--r--thread.c15
1 files changed, 10 insertions, 5 deletions
diff --git a/thread.c b/thread.c
index cd492df847..dbdbf43c53 100644
--- a/thread.c
+++ b/thread.c
@@ -3079,6 +3079,7 @@ call_trace_proc(VALUE args, int tracing)
struct call_trace_func_args *p = (struct call_trace_func_args *)args;
VALUE eventname = rb_str_new2(get_event_name(p->event));
VALUE filename = rb_str_new2(rb_sourcefile());
+ VALUE argv[6];
int line = rb_sourceline();
ID id = 0;
VALUE klass = 0;
@@ -3101,11 +3102,15 @@ call_trace_proc(VALUE args, int tracing)
klass = rb_iv_get(klass, "__attached__");
}
}
- return rb_proc_call(p->proc, rb_ary_new3(6,
- eventname, filename, INT2FIX(line),
- id ? ID2SYM(id) : Qnil,
- p->self ? rb_binding_new() : Qnil,
- klass ? klass : Qnil), 0);
+
+ argv[0] = eventname;
+ argv[1] = filename;
+ argv[2] = INT2FIX(line);
+ argv[3] = id ? ID2SYM(id) : Qnil;
+ argv[4] = p->self ? rb_binding_new() : Qnil;
+ argv[5] = klass ? klass : Qnil;
+
+ return rb_proc_call_with_block(p->proc, 6, argv, Qnil);
}
static void