summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-02-20 07:30:24 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-02-20 07:30:24 +0000
commit575ff86a4b01d91fef49484de70caf7c5212bb22 (patch)
treee0dd9a3c4e71d9c4587adaa61f45bbe795d33f5f /ext
parent6770402812366dac38469876c7493c9e3ab71ffe (diff)
merge revision(s) 44654: [Backport #9426]
tracepoint.c: disable tracepoint * ext/-test-/tracepoint/tracepoint.c (tracepoint_track_objspace_events): ensure tracepoint disabled. [ruby-dev:47901] [Bug #9426] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@45062 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
-rw-r--r--ext/-test-/tracepoint/tracepoint.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/ext/-test-/tracepoint/tracepoint.c b/ext/-test-/tracepoint/tracepoint.c
index 245dbd6191..aa8c212f99 100644
--- a/ext/-test-/tracepoint/tracepoint.c
+++ b/ext/-test-/tracepoint/tracepoint.c
@@ -64,8 +64,7 @@ tracepoint_track_objspace_events(VALUE self)
VALUE result = rb_ary_new();
rb_tracepoint_enable(tpval);
- rb_yield(Qundef);
- rb_tracepoint_disable(tpval);
+ rb_ensure(rb_yield, Qundef, rb_tracepoint_disable, tpval);
rb_ary_push(result, SIZET2NUM(track.newobj_count));
rb_ary_push(result, SIZET2NUM(track.free_count));