| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ipc/ipc_channel_reader.h" | 5 #include "ipc/ipc_channel_reader.h" |
| 6 | 6 |
| 7 #include "ipc/ipc_listener.h" | 7 #include "ipc/ipc_listener.h" |
| 8 #include "ipc/ipc_logging.h" | 8 #include "ipc/ipc_logging.h" |
| 9 #include "ipc/ipc_message_macros.h" | 9 #include "ipc/ipc_message_macros.h" |
| 10 | 10 |
| (...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 75 const char* message_tail = Message::FindNext(p, end); | 75 const char* message_tail = Message::FindNext(p, end); |
| 76 if (message_tail) { | 76 if (message_tail) { |
| 77 int len = static_cast<int>(message_tail - p); | 77 int len = static_cast<int>(message_tail - p); |
| 78 Message m(p, len); | 78 Message m(p, len); |
| 79 if (!WillDispatchInputMessage(&m)) | 79 if (!WillDispatchInputMessage(&m)) |
| 80 return false; | 80 return false; |
| 81 | 81 |
| 82 #ifdef IPC_MESSAGE_LOG_ENABLED | 82 #ifdef IPC_MESSAGE_LOG_ENABLED |
| 83 std::string name; | 83 std::string name; |
| 84 Logging::GetInstance()->GetMessageText(m.type(), &name, &m, NULL); | 84 Logging::GetInstance()->GetMessageText(m.type(), &name, &m, NULL); |
| 85 TRACE_EVENT1("ipc,toplevel", "ChannelReader::DispatchInputData", | 85 TRACE_EVENT_WITH_FLOW1("ipc,toplevel", "ChannelReader::DispatchInputData", |
| 86 "name", name); | 86 m.flags(), TRACE_EVENT_FLAG_FLOW_IN, "name", name); |
| 87 #else | 87 #else |
| 88 TRACE_EVENT2("ipc,toplevel", "ChannelReader::DispatchInputData", | 88 TRACE_EVENT_WITH_FLOW2("ipc,toplevel", "ChannelReader::DispatchInputData", |
| 89 "class", IPC_MESSAGE_ID_CLASS(m.type()), | 89 m.flags(), TRACE_EVENT_FLAG_FLOW_IN, "class", |
| 90 "line", IPC_MESSAGE_ID_LINE(m.type())); | 90 IPC_MESSAGE_ID_CLASS(m.type()), "line", |
| 91 IPC_MESSAGE_ID_LINE(m.type())); |
| 91 #endif | 92 #endif |
| 92 m.TraceMessageEnd(); | 93 m.TraceMessageEnd(); |
| 93 if (IsInternalMessage(m)) | 94 if (IsInternalMessage(m)) |
| 94 HandleInternalMessage(m); | 95 HandleInternalMessage(m); |
| 95 else | 96 else |
| 96 listener_->OnMessageReceived(m); | 97 listener_->OnMessageReceived(m); |
| 97 if (m.dispatch_error()) | 98 if (m.dispatch_error()) |
| 98 listener_->OnBadMessageReceived(m); | 99 listener_->OnBadMessageReceived(m); |
| 99 p = message_tail; | 100 p = message_tail; |
| 100 } else { | 101 } else { |
| 101 // Last message is partial. | 102 // Last message is partial. |
| 102 break; | 103 break; |
| 103 } | 104 } |
| 104 } | 105 } |
| 105 | 106 |
| 106 // Save any partial data in the overflow buffer. | 107 // Save any partial data in the overflow buffer. |
| 107 input_overflow_buf_.assign(p, end - p); | 108 input_overflow_buf_.assign(p, end - p); |
| 108 | 109 |
| 109 if (input_overflow_buf_.empty() && !DidEmptyInputBuffers()) | 110 if (input_overflow_buf_.empty() && !DidEmptyInputBuffers()) |
| 110 return false; | 111 return false; |
| 111 return true; | 112 return true; |
| 112 } | 113 } |
| 113 | 114 |
| 114 | 115 |
| 115 } // namespace internal | 116 } // namespace internal |
| 116 } // namespace IPC | 117 } // namespace IPC |
| OLD | NEW |