diff options
| author | dgp <dgp@users.sourceforge.net> | 2006-04-11 14:37:53 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2006-04-11 14:37:53 (GMT) |
| commit | a6c8df42563b94d6f02b77f4b894c63f36f35f56 (patch) | |
| tree | 4a0677f235a704de5dfa947b7addbed242d82689 /generic | |
| parent | 7b5e526e6bfd56a78a7f7d96a2e578212e88a98b (diff) | |
| download | tcl-a6c8df42563b94d6f02b77f4b894c63f36f35f56.zip tcl-a6c8df42563b94d6f02b77f4b894c63f36f35f56.tar.gz tcl-a6c8df42563b94d6f02b77f4b894c63f36f35f56.tar.bz2 | |
* generic/tclTrace.c: Stop some interference between enter traces
* tests/trace.test: and enterstep traces. [Bug 1458266]
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tclTrace.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/generic/tclTrace.c b/generic/tclTrace.c index 48cd1db..65c53f8 100644 --- a/generic/tclTrace.c +++ b/generic/tclTrace.c @@ -11,7 +11,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclTrace.c,v 1.32 2006/01/09 09:31:58 dkf Exp $ + * RCS: @(#) $Id: tclTrace.c,v 1.33 2006/04/11 14:37:54 dgp Exp $ */ #include "tclInt.h" @@ -1789,7 +1789,7 @@ TraceExecutionProc( if (call) { Tcl_DString cmd; Tcl_DString sub; - int i; + int i, saveInterpFlags; Tcl_DStringInit(&cmd); Tcl_DStringAppend(&cmd, tcmdPtr->command, (int)tcmdPtr->length); @@ -1852,8 +1852,9 @@ TraceExecutionProc( * returns. */ - tcmdPtr->flags |= TCL_TRACE_EXEC_IN_PROGRESS; + saveInterpFlags = iPtr->flags; iPtr->flags |= INTERP_TRACE_IN_PROGRESS; + tcmdPtr->flags |= TCL_TRACE_EXEC_IN_PROGRESS; tcmdPtr->refCount++; /* @@ -1864,7 +1865,12 @@ TraceExecutionProc( traceCode = Tcl_Eval(interp, Tcl_DStringValue(&cmd)); tcmdPtr->flags &= ~TCL_TRACE_EXEC_IN_PROGRESS; - iPtr->flags &= ~INTERP_TRACE_IN_PROGRESS; + + /* + * Restore the interp tracing flag to prevent cmd traces + * from affecting interp traces. + */ + iPtr->flags = saveInterpFlags; if (tcmdPtr->flags == 0) { flags |= TCL_TRACE_DESTROYED; } |