From 96175f1ebfd109f1268898d68a735ec5a16e9933 Mon Sep 17 00:00:00 2001
From: Siri Hansen <siri@erlang.org>
Date: Wed, 20 Apr 2016 11:43:08 +0200
Subject: [ttb] Set trace patterns on messages

Functions ttb:tpe/2 and ttb:ctpe/1 are added.
---
 lib/observer/doc/src/ttb.xml | 28 +++++++++++++++++++---------
 lib/observer/src/ttb.erl     | 12 +++++++++++-
 2 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/lib/observer/doc/src/ttb.xml b/lib/observer/doc/src/ttb.xml
index 2b637551db..76bbc777e8 100644
--- a/lib/observer/doc/src/ttb.xml
+++ b/lib/observer/doc/src/ttb.xml
@@ -257,17 +257,23 @@ ttb:p(all, call).</input></pre>
     </func>
 
     <func>
-      <name>tp, tpl, ctp, ctpl, ctpg</name>
+      <name>tp, tpl, tpe, ctp, ctpl, ctpg, ctpe</name>
       <fsummary>Set and clear trace patterns.</fsummary>
       <desc>
-        <p>These functions are to be used with
-          trace flag <c>call</c> for setting and clearing trace
-          patterns. When trace flag <c>call</c> is set on a process,
+        <p>These functions are to be used with trace
+          flag <c>call</c>, <c>send</c>, and <c>'receive'</c> for
+          setting and clearing trace patterns.</p>
+	<p>When trace flag <c>call</c> is set on a process,
           function calls are traced on that process if a trace
-          pattern is set for the called function. Trace patterns
-          specify how to trace a function by using match
-          specifications. Match specifications are described in the
-          <seealso marker="erts:users_guide"><c>ERTS User's Guide</c></seealso>.
+          pattern is set for the called function.</p>
+	<p>The <c>send</c> and <c>'receive'</c> flags enable tracing
+	  of all messages sent and received by the process. Trace
+	  patterns set with <c>tpe</c> may limit traced messages based
+	  on the message content, the sender, and/or the receiver.</p>
+	<p>Trace patterns specify how to trace a function or a message
+          by using match specifications. Match specifications are
+          described in the
+          <seealso marker="erts:match_spec"><c>ERTS User's Guide</c></seealso>.
           </p>
         <p>These functions are equivalent to the corresponding
           functions in module
@@ -284,6 +290,8 @@ ttb:p(all, call).</input></pre>
           <item><p>Sets trace patterns on global function calls.</p></item>
           <tag><c>tpl</c></tag>
           <item><p>Sets trace patterns on local and global function calls.</p></item>
+          <tag><c>tpe</c></tag>
+          <item><p>Sets trace patterns on messages.</p></item>
           <tag><c>ctp</c></tag>
           <item><p>Clears trace patterns on local and global function
            calls.</p></item>
@@ -291,13 +299,15 @@ ttb:p(all, call).</input></pre>
           <item><p>Clears trace patterns on local function calls.</p></item>
           <tag><c>ctpg</c></tag>
           <item><p>Clears trace patterns on global function calls.</p></item>
+          <tag><c>ctpe</c></tag>
+          <item><p>Clears trace patterns on messages.</p></item>
         </taglist>
         <p>With <c>tp</c> and <c>tpl</c>, one of the match specification shortcuts
           can be used (for example, <c>ttb:tp(foo_module, caller)</c>).</p>
 	  <p>The shortcuts are as follows:</p>
           <list type="bulleted">
             <item><c>return</c> - for <c>[{'_',[],[{return_trace}]}]</c>
-              (report the return value)</item>
+              (report the return value from a traced function)</item>
             <item><c>caller</c> - for <c>[{'_',[],[{message,{caller}}]}]</c>
               (report the calling function)</item>
             <item><c>{codestr, Str}</c> - for <c>dbg:fun2ms/1</c> arguments
diff --git a/lib/observer/src/ttb.erl b/lib/observer/src/ttb.erl
index 4d6eb3ba8d..32c2fad775 100644
--- a/lib/observer/src/ttb.erl
+++ b/lib/observer/src/ttb.erl
@@ -25,7 +25,8 @@
 -export([tracer/0,tracer/1,tracer/2,p/2,stop/0,stop/1,start_trace/4]).
 -export([get_et_handler/0]).
 -export([tp/2, tp/3, tp/4, ctp/0, ctp/1, ctp/2, ctp/3, tpl/2, tpl/3, tpl/4, 
-	 ctpl/0, ctpl/1, ctpl/2, ctpl/3, ctpg/0, ctpg/1, ctpg/2, ctpg/3]).
+	 ctpl/0, ctpl/1, ctpl/2, ctpl/3, ctpg/0, ctpg/1, ctpg/2, ctpg/3,
+	 tpe/2, ctpe/1]).
 -export([seq_trigger_ms/0,seq_trigger_ms/1]).
 -export([write_trace_info/2]).
 -export([write_config/2,write_config/3,run_config/1,run_config/2,list_config/1]).
@@ -479,6 +480,11 @@ tpl(A,B,C,D) ->
     store(tpl,[A,B,C,ms(D)]),
     dbg:tpl(A,B,C,ms(D)).
 
+tpe(A,B) ->
+    ensure_no_overloaded_nodes(),
+    store(tpe,[A,ms(B)]),
+    dbg:tpe(A,ms(B)).
+
 ctp() ->
     store(ctp,[]),
     dbg:ctp().
@@ -518,6 +524,10 @@ ctpg(A,B,C) ->
     store(ctpg,[A,B,C]),
     dbg:ctpg(A,B,C).
 
+ctpe(A) ->
+    store(ctpe,[A]),
+    dbg:ctpe(A).
+
 ms(return) ->
     [{'_',[],[{return_trace}]}];
 ms(caller) ->
-- 
cgit v1.2.3