summaryrefslogtreecommitdiff
path: root/vm_core.h
diff options
context:
space:
mode:
authorko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-12-21 09:33:44 +0000
committerko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-12-21 09:33:44 +0000
commit87d48d14a0839316f051bddd4d794bdd64e49181 (patch)
treefee6b264b9be88a9aab9e93c0bb29ddf93cdc52c /vm_core.h
parent94a4bc0ef4165e42ec36c9562ce7a7bcf01ba1cf (diff)
* 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 'vm_core.h')
-rw-r--r--vm_core.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/vm_core.h b/vm_core.h
index 23756f9bb4..4bc96cb52f 100644
--- a/vm_core.h
+++ b/vm_core.h
@@ -596,7 +596,7 @@ typedef struct rb_thread_struct {
/* tracer */
rb_hook_list_t event_hooks;
- int trace_running;
+ struct rb_trace_arg_struct *trace_arg; /* trace information */
/* fiber */
VALUE fiber;