summaryrefslogtreecommitdiff
path: root/vm_trace.c
diff options
context:
space:
mode:
authorko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-12-11 19:17:25 +0000
committerko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-12-11 19:17:25 +0000
commit975e3a19a7ef725f6358d74f5bf7fd20d4403587 (patch)
tree22303ef0f4a2fc40fec963f9ffe68f244211fd15 /vm_trace.c
parent9e9498c227085d8b999799843aa2d388b19653a6 (diff)
do not disable `trace_` prefix insns.
* vm.c: introduce `ruby_vm_event_enabled_flags` which represents which event flags are enabled before. * vm_trace.c: do not turn off `trace_` prefix instructions because turn on overhead is a matter if a program repeats turn on and turn off frequently. * iseq.c (finish_iseq_build): respect `ruby_vm_event_enabled_flags`. * vm_insnhelper.c (vm_trace): check `ruby_vm_event_flags` and disable lazy trace-off technique (do not disable traces). git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@61122 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm_trace.c')
-rw-r--r--vm_trace.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/vm_trace.c b/vm_trace.c
index 2adadff178..b2b859e2a3 100644
--- a/vm_trace.c
+++ b/vm_trace.c
@@ -65,14 +65,15 @@ static void
update_global_event_hook(rb_event_flag_t vm_events)
{
rb_event_flag_t new_iseq_events = vm_events & ISEQ_TRACE_EVENTS;
- rb_event_flag_t cur_iseq_events = ruby_vm_event_flags & ISEQ_TRACE_EVENTS;
+ rb_event_flag_t enabled_iseq_events = ruby_vm_event_enabled_flags & ISEQ_TRACE_EVENTS;
- if (new_iseq_events > cur_iseq_events) {
+ if (new_iseq_events & ~enabled_iseq_events) {
/* write all ISeqs iff new events are added */
- rb_iseq_trace_set_all(new_iseq_events);
+ rb_iseq_trace_set_all(new_iseq_events | enabled_iseq_events);
}
ruby_vm_event_flags = vm_events;
+ ruby_vm_event_enabled_flags |= vm_events;
rb_objspace_set_event_hook(vm_events);
}