1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* vm_trace.c: TracePoint#enable should not cause an error

Browse Source 
when it is already enabled. TracePoint#disable is too.
  [ruby-core:50561] [ruby-trunk - Bug #7513]
* test/ruby/test_settracefunc.rb: add tests.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38227 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
ko1 2012-12-06 03:13:50 +00:00
parent 54c40f3db5
commit c2f5a57403
3 changed files with 57 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
Thu Dec 06 12:07:11 2012 Koichi Sasada <ko1@atdot.net>
* vm_trace.c: TracePoint#enable should not cause an error
when it is already enabled. TracePoint#disable is too.
[ruby-core:50561] [ruby-trunk - Bug #7513]
* test/ruby/test_settracefunc.rb: add tests.
Thu Dec 6 07:19:58 2012 Eric Hodel <drbrain@segment7.net> Thu Dec 6 07:19:58 2012 Eric Hodel <drbrain@segment7.net>
* lib/rdoc*: Improved display of ChangeLog files as HTML. * lib/rdoc*: Improved display of ChangeLog files as HTML.

18
test/ruby/test_settracefunc.rb
View File

@ -623,6 +623,16 @@ class TestSetTraceFunc < Test::Unit::TestCase
} }
foo foo
assert_equal([:foo], ary) assert_equal([:foo], ary)
trace = TracePoint.new{}
begin
assert_equal(false, trace.enable)
assert_equal(true, trace.enable)
trace.enable{}
assert_equal(true, trace.enable)
ensure
trace.disable
end
end end
def test_tracepoint_disable def test_tracepoint_disable
@ -637,6 +647,14 @@ class TestSetTraceFunc < Test::Unit::TestCase
foo foo
trace.disable trace.disable
assert_equal([:foo, :foo], ary) assert_equal([:foo, :foo], ary)
trace = TracePoint.new{}
trace.enable{
assert_equal(true, trace.disable)
assert_equal(false, trace.disable)
trace.disable{}
assert_equal(false, trace.disable)
}
end end
def test_tracepoint_enabled def test_tracepoint_enabled

57
vm_trace.c
View File

@ -952,20 +952,23 @@ rb_tracepoint_disable(VALUE tpval)
/* /*
* call-seq: * call-seq:
* trace.enable -> trace * trace.enable -> true or false
* trace.enable { block } -> obj * trace.enable { block } -> obj
* *
* Activates the trace * Activates the trace
* *
* Will raise a RuntimeError if the trace is already activated * Return true if trace was enabled.
* Return false if trace was disabled.
* *
* trace.enabled? #=> false * trace.enabled? #=> false
* trace.enable #=> #<TracePoint:0x007fa3fad4aaa8> * trace.enable #=> false (previous state)
* # trace is enabled
* trace.enabled? #=> true * trace.enabled? #=> true
* trace.enable #=> RuntimeError * trace.enable #=> true (previous state)
* # trace is still enabled
* *
* If a block is given, the trace will only be enabled within the scope of the * If a block is given, the trace will only be enabled within the scope of the
* block. Note: You cannot access event hooks within the block. * block.
* *
* trace.enabled? * trace.enabled?
* #=> false * #=> false
@ -978,6 +981,8 @@ rb_tracepoint_disable(VALUE tpval)
* trace.enabled? * trace.enabled?
* #=> false * #=> false
* *
* Note: You cannot access event hooks within the block.
*
* trace.enable { p tp.lineno } * trace.enable { p tp.lineno }
* #=> RuntimeError: access from outside * #=> RuntimeError: access from outside
* *
@ -986,36 +991,36 @@ static VALUE
tracepoint_enable_m(VALUE tpval) tracepoint_enable_m(VALUE tpval)
{ {
rb_tp_t *tp = tpptr(tpval); rb_tp_t *tp = tpptr(tpval);
int previous_tracing = tp->tracing;
if (tp->tracing) {
rb_raise(rb_eRuntimeError, "trace is already enable");
}
rb_tracepoint_enable(tpval); rb_tracepoint_enable(tpval);
if (rb_block_given_p()) { if (rb_block_given_p()) {
return rb_ensure(rb_yield, Qnil, rb_tracepoint_disable, tpval); return rb_ensure(rb_yield, Qnil,
previous_tracing ? rb_tracepoint_enable : rb_tracepoint_disable,
tpval);
} }
else { else {
return tpval; return previous_tracing ? Qtrue : Qfalse;
} }
} }
/* /*
* call-seq: * call-seq:
* trace.disable -> trace * trace.disable -> tru eo rfalse
* trace.disable { block } -> obj * trace.disable { block } -> obj
* *
* Deactivates the trace * Deactivates the trace
* *
* Will raise a RuntimeError if the trace is already deactivated * Return true if trace was enabled.
* Return false if trace was disabled.
* *
* trace.enabled? #=> true * trace.enabled? #=> true
* trace.disable #=> #<TracePoint:0x007fa3fad4aaa8> * trace.disable #=> false (previous status)
* trace.enabled? #=> false * trace.enabled? #=> false
* trace.disable #=> RuntimeError * trace.disable #=> false
* *
* If a block is given, the trace will only be disable within the scope of the * If a block is given, the trace will only be disable within the scope of the
* block. Note: You cannot access event hooks within the block. * block.
* *
* trace.enabled? * trace.enabled?
* #=> true * #=> true
@ -1028,25 +1033,25 @@ tracepoint_enable_m(VALUE tpval)
* trace.enabled? * trace.enabled?
* #=> true * #=> true
* *
* trace.enable { p trace.lineno } * Note: You cannot access event hooks within the block.
* #=> RuntimeError: access from outside
* *
* trace.disable { p tp.lineno }
* #=> RuntimeError: access from outside
*/ */
static VALUE static VALUE
tracepoint_disable_m(VALUE tpval) tracepoint_disable_m(VALUE tpval)
{ {
rb_tp_t *tp = tpptr(tpval); rb_tp_t *tp = tpptr(tpval);
int previous_tracing = tp->tracing;
if (!tp->tracing) {
rb_raise(rb_eRuntimeError, "trace is not enable");
}
rb_tracepoint_disable(tpval); rb_tracepoint_disable(tpval);
if (rb_block_given_p()) { if (rb_block_given_p()) {
return rb_ensure(rb_yield, Qnil, rb_tracepoint_enable, tpval); return rb_ensure(rb_yield, Qnil,
previous_tracing ? rb_tracepoint_enable : rb_tracepoint_disable,
tpval);
} }
else { else {
return tpval; return previous_tracing ? Qtrue : Qfalse;
} }
} }