1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* vm_trace.c (rb_threadptr_exec_event_hooks_orig):

Browse Source 
maintain trace_running counter on internal events.

  This patch is made by Takashi Kokubun <takashikkbn@gmail.com>.
  [Bug #11603] https://github.com/ruby/ruby/pull/1059




git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52476 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
ko1 2015-11-07 00:55:11 +00:00
parent 9d0012b0e7
commit 2d4bc584ee
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
Sat Nov 7 09:51:38 2015 Koichi Sasada <ko1@atdot.net>
* vm_trace.c (rb_threadptr_exec_event_hooks_orig):
maintain trace_running counter on internal events.
This patch is made by Takashi Kokubun <takashikkbn@gmail.com>.
[Bug #11603] https://github.com/ruby/ruby/pull/1059
Sat Nov 7 03:32:27 2015 Koichi Sasada <ko1@atdot.net> Sat Nov 7 03:32:27 2015 Koichi Sasada <ko1@atdot.net>
* include/ruby/ruby.h (RSTRUCT_PTR): need a close parenthese. * include/ruby/ruby.h (RSTRUCT_PTR): need a close parenthese.

2
vm_trace.c
View File

@ -318,10 +318,12 @@ rb_threadptr_exec_event_hooks_orig(rb_trace_arg_t *trace_arg, int pop_p)
} }
else { else {
rb_trace_arg_t *prev_trace_arg = th->trace_arg; rb_trace_arg_t *prev_trace_arg = th->trace_arg;
th->vm->trace_running++;
th->trace_arg = trace_arg; th->trace_arg = trace_arg;
exec_hooks_unprotected(th, &th->event_hooks, trace_arg); exec_hooks_unprotected(th, &th->event_hooks, trace_arg);
exec_hooks_unprotected(th, &th->vm->event_hooks, trace_arg); exec_hooks_unprotected(th, &th->vm->event_hooks, trace_arg);
th->trace_arg = prev_trace_arg; th->trace_arg = prev_trace_arg;
th->vm->trace_running--;
} }
} }
else { else {