diff options
| -rw-r--r-- | chrome/common/ipc_logging.cc | 4 | ||||
| -rw-r--r-- | chrome/common/ipc_message_utils.h | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/chrome/common/ipc_logging.cc b/chrome/common/ipc_logging.cc index cb63533..0f49b39 100644 --- a/chrome/common/ipc_logging.cc +++ b/chrome/common/ipc_logging.cc @@ -268,8 +268,9 @@ void Logging::Log(const LogData& data) { } #elif defined(OS_POSIX) // On POSIX, for now, we just dump the log to stderr - fprintf(stderr, "ipc %s %d %s %s %s\n", + fprintf(stderr, "ipc %s %d %d %s %s %s\n", WideToUTF8(data.channel).c_str(), + data.routing_id, data.type, WideToUTF8(data.flags).c_str(), WideToUTF8(data.message_name).c_str(), @@ -305,6 +306,7 @@ void GenerateLogData(const std::wstring& channel, const Message& message, Logging::GetMessageText(message.type(), &message_name, &message, ¶ms); data->channel = channel; + data->routing_id = message.routing_id(); data->type = message.type(); data->flags = flags; data->sent = message.sent_time(); diff --git a/chrome/common/ipc_message_utils.h b/chrome/common/ipc_message_utils.h index 6e82d40..8e4e8a5 100644 --- a/chrome/common/ipc_message_utils.h +++ b/chrome/common/ipc_message_utils.h @@ -830,6 +830,7 @@ struct ParamTraits<WebCursor> { struct LogData { std::wstring channel; + int32 routing_id; uint16 type; std::wstring flags; int64 sent; // Time that the message was sent (i.e. at Send()). @@ -846,6 +847,7 @@ struct ParamTraits<LogData> { typedef LogData param_type; static void Write(Message* m, const param_type& p) { WriteParam(m, p.channel); + WriteParam(m, p.routing_id); WriteParam(m, static_cast<int>(p.type)); WriteParam(m, p.flags); WriteParam(m, p.sent); @@ -857,6 +859,7 @@ struct ParamTraits<LogData> { int type; bool result = ReadParam(m, iter, &r->channel) && + ReadParam(m, iter, &r->routing_id); ReadParam(m, iter, &type) && ReadParam(m, iter, &r->flags) && ReadParam(m, iter, &r->sent) && |