diff options
author | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-12-21 09:33:44 +0000 |
---|---|---|
committer | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-12-21 09:33:44 +0000 |
commit | 87d48d14a0839316f051bddd4d794bdd64e49181 (patch) | |
tree | fee6b264b9be88a9aab9e93c0bb29ddf93cdc52c /cont.c | |
parent | 94a4bc0ef4165e42ec36c9562ce7a7bcf01ba1cf (diff) | |
download | ruby-87d48d14a0839316f051bddd4d794bdd64e49181.tar.gz |
* vm_core.h, vm_trace.c: fix multi-threading bug for tracing.
Move `trace_arg' from rb_tp_t::trace_arg to rb_thread_t::trace_arg.
`trace_arg' may changed by multiple threads.
rb_thread_t::trace_arg can represent rb_thread_t::trace_running
(null or non-null) and rb_thread_t::trace_running is removed.
After that, `rb_tp_t' is not needed to check tracing or not
(A running thread knows tracing or not). This is why I remove
tp_attr_check_active() and make new function get_trace_arg().
And this modification disable to work the following code:
TracePoint.trace{|tp|
Thread.new{p tp.event} # access `tp' from other threads.
}
I believe nobody mix threads at trace procedure.
This is current limitation.
* cont.c (fiber_switch, rb_cont_call): use rb_thread_t::trace_arg
instead of rb_thread_t::trace_running.
* test/ruby/test_settracefunc.rb: add a multi-threading test.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38524 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'cont.c')
-rw-r--r-- | cont.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -924,7 +924,7 @@ rb_cont_call(int argc, VALUE *argv, VALUE contval) cont->value = make_passing_arg(argc, argv); /* restore `tracing' context. see [Feature #4347] */ - th->trace_running = cont->saved_thread.trace_running; + th->trace_arg = cont->saved_thread.trace_arg; cont_restore_0(cont, &contval); return Qnil; /* unreachable */ @@ -1318,7 +1318,7 @@ fiber_switch(VALUE fibval, int argc, VALUE *argv, int is_resume) } else { /* restore `tracing' context. see [Feature #4347] */ - th->trace_running = cont->saved_thread.trace_running; + th->trace_arg = cont->saved_thread.trace_arg; } cont->argc = argc; |