archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-18 10:03:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

merge revision(s) 44654: [Backport #9426]

Browse source 
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
This commit is contained in:
naruse 2014-02-20 07:30:24 +00:00
parent 6770402812
commit 575ff86a4b
2 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
ext/-test-/tracepoint/tracepoint.c
View file

@ -64,8 +64,7 @@ tracepoint_track_objspace_events(VALUE self)
VALUE result = rb_ary_new(); VALUE result = rb_ary_new();
rb_tracepoint_enable(tpval); rb_tracepoint_enable(tpval);
rb_yield(Qundef); rb_ensure(rb_yield, Qundef, rb_tracepoint_disable, tpval);
rb_tracepoint_disable(tpval);
rb_ary_push(result, SIZET2NUM(track.newobj_count)); rb_ary_push(result, SIZET2NUM(track.newobj_count));
rb_ary_push(result, SIZET2NUM(track.free_count)); rb_ary_push(result, SIZET2NUM(track.free_count));

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.1.1" #define RUBY_VERSION "2.1.1"
#define RUBY_RELEASE_DATE "2014-02-20" #define RUBY_RELEASE_DATE "2014-02-20"
#define RUBY_PATCHLEVEL 38 #define RUBY_PATCHLEVEL 39
#define RUBY_RELEASE_YEAR 2014 #define RUBY_RELEASE_YEAR 2014
#define RUBY_RELEASE_MONTH 2 #define RUBY_RELEASE_MONTH 2