diff options
| author | Dan Gudmundsson <[email protected]> | 2014-12-09 10:10:42 +0100 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2014-12-09 10:10:42 +0100 |
| commit | 3d74c34a07a809c21ec028624f935d9ae9f8081c (patch) | |
| tree | c32ba9288f50e89ba5daa41d9d55dcd1c8d4256e | |
| parent | eae9bc5a7a5875c1e37000b90b73927951f85ba8 (diff) | |
| parent | 6d9e36c740dee112e502e7c8332fbe5e983a13ab (diff) | |
| download | otp-3d74c34a07a809c21ec028624f935d9ae9f8081c.tar.gz otp-3d74c34a07a809c21ec028624f935d9ae9f8081c.tar.bz2 otp-3d74c34a07a809c21ec028624f935d9ae9f8081c.zip | |
Merge branch 'maint'
| -rw-r--r-- | lib/debugger/doc/src/i.xml | 2 | ||||
| -rw-r--r-- | lib/debugger/doc/src/int.xml | 2 | ||||
| -rw-r--r-- | lib/debugger/src/dbg_wx_mon.erl | 2 | ||||
| -rw-r--r-- | lib/debugger/src/i.erl | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/lib/debugger/doc/src/i.xml b/lib/debugger/doc/src/i.xml index fb7641c30e..7564da79b3 100644 --- a/lib/debugger/doc/src/i.xml +++ b/lib/debugger/doc/src/i.xml @@ -211,7 +211,7 @@ the result of calling the shell function <c>pid(X,Y,Z)</c>. An attached process is expected to call the unofficial <c>int:attached(Pid)</c> function and to be able to handle - messages from the interpreter, see <c>dbg_ui_trace.erl</c> for + messages from the interpreter, see <c>dbg_wx_trace.erl</c> for an example.</p> </desc> </func> diff --git a/lib/debugger/doc/src/int.xml b/lib/debugger/doc/src/int.xml index 3a5886ceb9..96d0d7f83d 100644 --- a/lib/debugger/doc/src/int.xml +++ b/lib/debugger/doc/src/int.xml @@ -49,7 +49,7 @@ execution. This is done by sending and receiving information to/from the process via a third process, called the meta process. It is possible to implement your own attached process. See - <c>int.erl</c> for available functions and <c>dbg_ui_trace.erl</c> + <c>int.erl</c> for available functions and <c>dbg_wx_trace.erl</c> for possible messages.</p> <p>The interpreter depends on the Kernel, STDLIB and GS diff --git a/lib/debugger/src/dbg_wx_mon.erl b/lib/debugger/src/dbg_wx_mon.erl index 4ab03985d3..aed86f5232 100644 --- a/lib/debugger/src/dbg_wx_mon.erl +++ b/lib/debugger/src/dbg_wx_mon.erl @@ -414,7 +414,7 @@ gui_cmd({'Trace Window', TraceWin}, State) -> State2 = State#state{tracewin=TraceWin}, case State#state.attach of false -> ignore; - {Flags, {dbg_ui_trace, start, StartFlags}} -> + {Flags, {dbg_wx_trace, start, StartFlags}} -> case trace_function(State2) of {_, _, StartFlags} -> ignore; NewFunction -> % {_, _, NewStartFlags} diff --git a/lib/debugger/src/i.erl b/lib/debugger/src/i.erl index 5805501524..0afb998097 100644 --- a/lib/debugger/src/i.erl +++ b/lib/debugger/src/i.erl @@ -250,7 +250,7 @@ ist(Flag) -> %% ------------------------------------------- iaa(Flag) -> - iaa(Flag,{dbg_ui_trace,start,[]}). + iaa(Flag,{dbg_wx_trace,start,[]}). %% ------------------------------------------- %% Set the automatic attachment flag. @@ -271,7 +271,7 @@ iaa(Flag,Fnk) -> %% ------------------------------------------- ia(Pid) -> - ia(Pid,{dbg_ui_trace,start}). + ia(Pid,{dbg_wx_trace,start}). %% ------------------------------------------- %% Attach to process. |