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_posix.h" | 5 #include "ipc/ipc_channel_posix.h" |
6 | 6 |
7 #include <errno.h> | 7 #include <errno.h> |
8 #include <fcntl.h> | 8 #include <fcntl.h> |
9 #include <stddef.h> | 9 #include <stddef.h> |
10 #include <sys/socket.h> | 10 #include <sys/socket.h> |
(...skipping 509 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
520 DVLOG(2) << "sent message @" << msg << " on channel @" << this | 520 DVLOG(2) << "sent message @" << msg << " on channel @" << this |
521 << " with type " << msg->type() << " on fd " << pipe_; | 521 << " with type " << msg->type() << " on fd " << pipe_; |
522 delete output_queue_.front(); | 522 delete output_queue_.front(); |
523 output_queue_.pop(); | 523 output_queue_.pop(); |
524 } | 524 } |
525 } | 525 } |
526 return true; | 526 return true; |
527 } | 527 } |
528 | 528 |
529 bool Channel::ChannelImpl::Send(Message* message) { | 529 bool Channel::ChannelImpl::Send(Message* message) { |
530 // TODO(vtl): Remove once bug resolved. | |
531 CHECK(message && message->data()) << "crbug.com/357915"; | |
532 DVLOG(2) << "sending message @" << message << " on channel @" << this | 530 DVLOG(2) << "sending message @" << message << " on channel @" << this |
533 << " with type " << message->type() | 531 << " with type " << message->type() |
534 << " (" << output_queue_.size() << " in queue)"; | 532 << " (" << output_queue_.size() << " in queue)"; |
535 | 533 |
536 #ifdef IPC_MESSAGE_LOG_ENABLED | 534 #ifdef IPC_MESSAGE_LOG_ENABLED |
537 Logging::GetInstance()->OnSendMessage(message, ""); | 535 Logging::GetInstance()->OnSendMessage(message, ""); |
538 #endif // IPC_MESSAGE_LOG_ENABLED | 536 #endif // IPC_MESSAGE_LOG_ENABLED |
539 | 537 |
540 message->TraceMessageBegin(); | 538 message->TraceMessageBegin(); |
541 output_queue_.push(message); | 539 output_queue_.push(message); |
(...skipping 577 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1119 | 1117 |
1120 | 1118 |
1121 #if defined(OS_LINUX) | 1119 #if defined(OS_LINUX) |
1122 // static | 1120 // static |
1123 void Channel::SetGlobalPid(int pid) { | 1121 void Channel::SetGlobalPid(int pid) { |
1124 ChannelImpl::SetGlobalPid(pid); | 1122 ChannelImpl::SetGlobalPid(pid); |
1125 } | 1123 } |
1126 #endif // OS_LINUX | 1124 #endif // OS_LINUX |
1127 | 1125 |
1128 } // namespace IPC | 1126 } // namespace IPC |
OLD | NEW |