ko1	2015-11-07 09:55:11 +0900 (Sat, 07 Nov 2015)

  New Revision: 52476

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=52476

  Log:
    * vm_trace.c (rb_threadptr_exec_event_hooks_orig):
      maintain trace_running counter on internal events.
    
      This patch is made by Takashi Kokubun <takashikkbn@g...>.
      [Bug #11603] https://github.com/ruby/ruby/pull/1059

  Modified files:
    trunk/ChangeLog
    trunk/vm_trace.c
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 52475)
+++ ChangeLog	(revision 52476)
@@ -1,3 +1,11 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Sat Nov  7 09:51:38 2015  Koichi Sasada  <ko1@a...>
+
+	* vm_trace.c (rb_threadptr_exec_event_hooks_orig): 
+	  maintain trace_running counter on internal events.
+
+	  This patch is made by Takashi Kokubun <takashikkbn@g...>.
+	  [Bug #11603] https://github.com/ruby/ruby/pull/1059
+
 Sat Nov  7 03:32:27 2015  Koichi Sasada  <ko1@a...>
 
 	* include/ruby/ruby.h (RSTRUCT_PTR): need a close parenthese.
Index: vm_trace.c
===================================================================
--- vm_trace.c	(revision 52475)
+++ vm_trace.c	(revision 52476)
@@ -318,10 +318,12 @@ rb_threadptr_exec_event_hooks_orig(rb_tr https://github.com/ruby/ruby/blob/trunk/vm_trace.c#L318
 	}
 	else {
 	    rb_trace_arg_t *prev_trace_arg = th->trace_arg;
+	    th->vm->trace_running++;
 	    th->trace_arg = trace_arg;
 	    exec_hooks_unprotected(th, &th->event_hooks, trace_arg);
 	    exec_hooks_unprotected(th, &th->vm->event_hooks, trace_arg);
 	    th->trace_arg = prev_trace_arg;
+	    th->vm->trace_running--;
 	}
     }
     else {

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/