nagachika	2015-11-08 23:49:09 +0900 (Sun, 08 Nov 2015)

  New Revision: 52497

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

  Log:
    merge revision(s) 52476,52477: [Backport #11603]
    
    * 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
    
    * vm_trace.c (rb_threadptr_exec_event_hooks_orig):

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/version.h
    branches/ruby_2_2/vm_trace.c
Index: ruby_2_2/ChangeLog
===================================================================
--- ruby_2_2/ChangeLog	(revision 52496)
+++ ruby_2_2/ChangeLog	(revision 52497)
@@ -1,3 +1,11 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L1
+Sun Nov  8 23:30:56 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
+
 Sun Nov  1 03:52:41 2015  Aaron Patterson <tenderlove@r...>
 
 	* test/openssl/test_ssl_session.rb: Fix tests so that they take in to
Index: ruby_2_2/vm_trace.c
===================================================================
--- ruby_2_2/vm_trace.c	(revision 52496)
+++ ruby_2_2/vm_trace.c	(revision 52497)
@@ -318,10 +318,12 @@ rb_threadptr_exec_event_hooks_orig(rb_tr https://github.com/ruby/ruby/blob/trunk/ruby_2_2/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 {
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 52496)
+++ ruby_2_2/version.h	(revision 52497)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #define RUBY_VERSION "2.2.4"
-#define RUBY_RELEASE_DATE "2015-11-01"
-#define RUBY_PATCHLEVEL 185
+#define RUBY_RELEASE_DATE "2015-11-08"
+#define RUBY_PATCHLEVEL 186
 
 #define RUBY_RELEASE_YEAR 2015
 #define RUBY_RELEASE_MONTH 11
-#define RUBY_RELEASE_DAY 1
+#define RUBY_RELEASE_DAY 8
 
 #include "ruby/version.h"
 

Property changes on: ruby_2_2
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r52476-52477


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