Trace PostTasks from post to run.

To do this properly, we need a new type of trace event "FLOW" which will be drawn as lines in about:tracing from BEGIN to END.

Also instruments SequencedWorkerPool and ChannelReader::DispatchInputData, which were not currently traced.

BUG=79942

Review URL: https://codereview.chromium.org/10913242

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@157288 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 24 insertions, 8 deletions

diff --git a/ipc/ipc_channel_nacl.cc b/ipc/ipc_channel_nacl.cc
index 0d50a57..4231dd8 100644
--- a/ipc/ipc_channel_nacl.cc
+++ b/ipc/ipc_channel_nacl.cc
@@ -193,7 +193,7 @@ bool Channel::ChannelImpl::Send(Message* message) {
   Logging::GetInstance()->OnSendMessage(message_ptr.get(), "");
 #endif  // IPC_MESSAGE_LOG_ENABLED
 
-  message->TraceMessageStep();
+  message->TraceMessageBegin();
   output_queue_.push_back(linked_ptr<Message>(message_ptr.release()));
   if (!waiting_connect_)
     return ProcessOutgoingMessages();
diff --git a/ipc/ipc_channel_posix.cc b/ipc/ipc_channel_posix.cc
index 37bc7e4..f5cf8af 100644
--- a/ipc/ipc_channel_posix.cc
+++ b/ipc/ipc_channel_posix.cc
@@ -631,7 +631,7 @@ bool Channel::ChannelImpl::Send(Message* message) {
   Logging::GetInstance()->OnSendMessage(message, "");
 #endif  // IPC_MESSAGE_LOG_ENABLED
 
-  message->TraceMessageStep();
+  message->TraceMessageBegin();
   output_queue_.push(message);
   if (!is_blocked_on_write_ && !waiting_connect_) {
     return ProcessOutgoingMessages();
diff --git a/ipc/ipc_channel_proxy.cc b/ipc/ipc_channel_proxy.cc
index 630b0cf..0b2338c 100644
--- a/ipc/ipc_channel_proxy.cc
+++ b/ipc/ipc_channel_proxy.cc
@@ -351,7 +351,6 @@ void ChannelProxy::Close() {
 
 bool ChannelProxy::Send(Message* message) {
   DCHECK(did_init_);
-  message->TraceMessageStep();
   if (outgoing_message_filter())
     message = outgoing_message_filter()->Rewrite(message);
 
diff --git a/ipc/ipc_channel_reader.cc b/ipc/ipc_channel_reader.cc
index 8e8b6a65..2f291a9 100644
--- a/ipc/ipc_channel_reader.cc
+++ b/ipc/ipc_channel_reader.cc
@@ -4,6 +4,9 @@
 
 #include "ipc/ipc_channel_reader.h"
 
+#include "ipc/ipc_logging.h"
+#include "ipc/ipc_message_macros.h"
+
 namespace IPC {
 namespace internal {
 
@@ -69,7 +72,17 @@ bool ChannelReader::DispatchInputData(const char* input_data,
       if (!WillDispatchInputMessage(&m))
         return false;
 
-      m.TraceMessageStep();
+#ifdef IPC_MESSAGE_LOG_ENABLED
+      Logging* logger = Logging::GetInstance();
+      std::string name;
+      logger->GetMessageText(m.type(), &name, &m, NULL);
+      TRACE_EVENT1("ipc", "ChannelReader::DispatchInputData", "name", name);
+#else
+      TRACE_EVENT2("ipc", "ChannelReader::DispatchInputData",
+                   "class", IPC_MESSAGE_ID_CLASS(m.type()),
+                   "line", IPC_MESSAGE_ID_LINE(m.type()));
+#endif
+      m.TraceMessageEnd();
       if (IsHelloMessage(m))
         HandleHelloMessage(m);
       else
diff --git a/ipc/ipc_channel_win.cc b/ipc/ipc_channel_win.cc
index 77ea64c..3cc1c6e 100644
--- a/ipc/ipc_channel_win.cc
+++ b/ipc/ipc_channel_win.cc
@@ -88,7 +88,7 @@ bool Channel::ChannelImpl::Send(Message* message) {
   Logging::GetInstance()->OnSendMessage(message, "");
 #endif
 
-  message->TraceMessageStep();
+  message->TraceMessageBegin();
   output_queue_.push(message);
   // ensure waiting to write
   if (!waiting_connect_) {
diff --git a/ipc/ipc_message.h b/ipc/ipc_message.h
index 3c62960..1ae9e75 100644
--- a/ipc/ipc_message.h
+++ b/ipc/ipc_message.h
@@ -224,9 +224,13 @@ class IPC_EXPORT Message : public Pickle {
   bool dont_log() const { return dont_log_; }
 #endif
 
-  // Called at various points between send and receive to track message.
-  void TraceMessageStep() {
-    TRACE_EVENT_ASYNC_STEP0("ipc", "IPC", header()->flags, "step");
+  // Called to trace when message is sent.
+  void TraceMessageBegin() {
+    TRACE_EVENT_FLOW_BEGIN0("ipc", "IPC", header()->flags);
+  }
+  // Called to trace when message is received.
+  void TraceMessageEnd() {
+    TRACE_EVENT_FLOW_END0("ipc", "IPC", header()->flags);
   }
 
  protected: