From 9752864b888a368188afaaf103e44f6da054c7dc Mon Sep 17 00:00:00 2001
From: mame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 21 Jul 2011 11:09:52 +0000
Subject: [PATCH] * thread.c (set_trace_func, thread_set_trace_func_m): reset
 tracing   state when set_trace_func hook is removed.  This is workaround
 patch   to force to reset tracing state that is broken by continuation call. 
  a patch from James M. Lawrence.  [Feature #4347] [ruby-core:34998]

* test/ruby/test_continuation.rb (class TestContinuation): add a test
  for above.  a patch from James M. Lawrence.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32597 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog                      | 10 ++++++++
 test/ruby/test_continuation.rb | 43 ++++++++++++++++++++++++++++++++++
 thread.c                       |  2 ++
 3 files changed, 55 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index bff05ad787..ab9eb26b5c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Thu Jul 21 20:02:11 2011  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* thread.c (set_trace_func, thread_set_trace_func_m): reset tracing
+	  state when set_trace_func hook is removed.  This is workaround patch
+	  to force to reset tracing state that is broken by continuation call.
+	  a patch from James M. Lawrence.  [Feature #4347] [ruby-core:34998]
+
+	* test/ruby/test_continuation.rb (class TestContinuation): add a test
+	  for above.  a patch from James M. Lawrence.
+
 Thu Jul 21 19:27:19 2011  Yusuke Endoh  <mame@tsg.ne.jp>
 
 	* node.c (dump_node): add today's knowledge.  "init arguments (m)" and
diff --git a/test/ruby/test_continuation.rb b/test/ruby/test_continuation.rb
index c719db8c35..64390d8177 100644
--- a/test/ruby/test_continuation.rb
+++ b/test/ruby/test_continuation.rb
@@ -77,5 +77,48 @@ class TestContinuation < Test::Unit::TestCase
     }, '[ruby-dev:34802]'
   end
 
+  def tracing_with_set_trace_func
+    cont = nil
+    func = lambda do |*args|
+      @memo += 1
+      cont.call(nil)
+    end
+    cont = callcc { |cc| cc }
+    if cont
+      set_trace_func(func)
+    else
+      set_trace_func(nil)
+    end
+  end
+
+  def test_tracing_with_set_trace_func
+    @memo = 0
+    tracing_with_set_trace_func
+    tracing_with_set_trace_func
+    tracing_with_set_trace_func
+    assert_equal 3, @memo
+  end
+
+  def tracing_with_thread_set_trace_func
+    cont = nil
+    func = lambda do |*args|
+      @memo += 1
+      cont.call(nil)
+    end
+    cont = callcc { |cc| cc }
+    if cont
+      Thread.current.set_trace_func(func)
+    else
+      Thread.current.set_trace_func(nil)
+    end
+  end
+
+  def test_tracing_with_thread_set_trace_func
+    @memo = 0
+    tracing_with_thread_set_trace_func
+    tracing_with_thread_set_trace_func
+    tracing_with_thread_set_trace_func
+    assert_equal 3, @memo
+  end
 end
 
diff --git a/thread.c b/thread.c
index 2da37dc137..56077d83c5 100644
--- a/thread.c
+++ b/thread.c
@@ -4347,6 +4347,7 @@ set_trace_func(VALUE obj, VALUE trace)
     rb_remove_event_hook(call_trace_func);
 
     if (NIL_P(trace)) {
+	GET_THREAD()->tracing = EVENT_RUNNING_NOTHING;
 	return Qnil;
     }
 
@@ -4403,6 +4404,7 @@ thread_set_trace_func_m(VALUE obj, VALUE trace)
     rb_threadptr_remove_event_hook(th, call_trace_func);
 
     if (NIL_P(trace)) {
+	th->tracing = EVENT_RUNNING_NOTHING;
 	return Qnil;
     }
     thread_add_trace_func(th, trace);