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_sync_message_filter.h" | 5 #include "ipc/ipc_sync_message_filter.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/location.h" | 8 #include "base/location.h" |
9 #include "base/logging.h" | 9 #include "base/logging.h" |
10 #include "base/message_loop/message_loop_proxy.h" | 10 #include "base/single_thread_task_runner.h" |
11 #include "base/synchronization/waitable_event.h" | 11 #include "base/synchronization/waitable_event.h" |
| 12 #include "base/thread_task_runner_handle.h" |
12 #include "ipc/ipc_channel.h" | 13 #include "ipc/ipc_channel.h" |
13 #include "ipc/ipc_sync_message.h" | 14 #include "ipc/ipc_sync_message.h" |
14 | 15 |
15 using base::MessageLoopProxy; | |
16 | |
17 namespace IPC { | 16 namespace IPC { |
18 | 17 |
19 SyncMessageFilter::SyncMessageFilter(base::WaitableEvent* shutdown_event) | 18 SyncMessageFilter::SyncMessageFilter(base::WaitableEvent* shutdown_event) |
20 : sender_(NULL), | 19 : sender_(NULL), |
21 listener_loop_(MessageLoopProxy::current()), | 20 listener_task_runner_(base::ThreadTaskRunnerHandle::Get()), |
22 shutdown_event_(shutdown_event) { | 21 shutdown_event_(shutdown_event) { |
23 } | 22 } |
24 | 23 |
25 bool SyncMessageFilter::Send(Message* message) { | 24 bool SyncMessageFilter::Send(Message* message) { |
26 { | 25 { |
27 base::AutoLock auto_lock(lock_); | 26 base::AutoLock auto_lock(lock_); |
28 if (!io_loop_.get()) { | 27 if (!io_task_runner_.get()) { |
29 delete message; | 28 delete message; |
30 return false; | 29 return false; |
31 } | 30 } |
32 } | 31 } |
33 | 32 |
34 if (!message->is_sync()) { | 33 if (!message->is_sync()) { |
35 io_loop_->PostTask( | 34 io_task_runner_->PostTask( |
36 FROM_HERE, base::Bind(&SyncMessageFilter::SendOnIOThread, this, message)); | 35 FROM_HERE, |
| 36 base::Bind(&SyncMessageFilter::SendOnIOThread, this, message)); |
37 return true; | 37 return true; |
38 } | 38 } |
39 | 39 |
40 base::WaitableEvent done_event(true, false); | 40 base::WaitableEvent done_event(true, false); |
41 PendingSyncMsg pending_message( | 41 PendingSyncMsg pending_message( |
42 SyncMessage::GetMessageId(*message), | 42 SyncMessage::GetMessageId(*message), |
43 static_cast<SyncMessage*>(message)->GetReplyDeserializer(), | 43 static_cast<SyncMessage*>(message)->GetReplyDeserializer(), |
44 &done_event); | 44 &done_event); |
45 | 45 |
46 { | 46 { |
47 base::AutoLock auto_lock(lock_); | 47 base::AutoLock auto_lock(lock_); |
48 // Can't use this class on the main thread or else it can lead to deadlocks. | 48 // Can't use this class on the main thread or else it can lead to deadlocks. |
49 // Also by definition, can't use this on IO thread since we're blocking it. | 49 // Also by definition, can't use this on IO thread since we're blocking it. |
50 DCHECK(MessageLoopProxy::current().get() != listener_loop_.get()); | 50 if (base::ThreadTaskRunnerHandle::IsSet()) { |
51 DCHECK(MessageLoopProxy::current().get() != io_loop_.get()); | 51 DCHECK(base::ThreadTaskRunnerHandle::Get() != listener_task_runner_); |
| 52 DCHECK(base::ThreadTaskRunnerHandle::Get() != io_task_runner_); |
| 53 } |
52 pending_sync_messages_.insert(&pending_message); | 54 pending_sync_messages_.insert(&pending_message); |
53 } | 55 } |
54 | 56 |
55 io_loop_->PostTask( | 57 io_task_runner_->PostTask( |
56 FROM_HERE, base::Bind(&SyncMessageFilter::SendOnIOThread, this, message)); | 58 FROM_HERE, base::Bind(&SyncMessageFilter::SendOnIOThread, this, message)); |
57 | 59 |
58 base::WaitableEvent* events[2] = { shutdown_event_, &done_event }; | 60 base::WaitableEvent* events[2] = { shutdown_event_, &done_event }; |
59 base::WaitableEvent::WaitMany(events, 2); | 61 base::WaitableEvent::WaitMany(events, 2); |
60 | 62 |
61 { | 63 { |
62 base::AutoLock auto_lock(lock_); | 64 base::AutoLock auto_lock(lock_); |
63 delete pending_message.deserializer; | 65 delete pending_message.deserializer; |
64 pending_sync_messages_.erase(&pending_message); | 66 pending_sync_messages_.erase(&pending_message); |
65 } | 67 } |
66 | 68 |
67 return pending_message.send_result; | 69 return pending_message.send_result; |
68 } | 70 } |
69 | 71 |
70 void SyncMessageFilter::OnFilterAdded(Sender* sender) { | 72 void SyncMessageFilter::OnFilterAdded(Sender* sender) { |
71 sender_ = sender; | 73 sender_ = sender; |
72 base::AutoLock auto_lock(lock_); | 74 base::AutoLock auto_lock(lock_); |
73 io_loop_ = MessageLoopProxy::current(); | 75 io_task_runner_ = base::ThreadTaskRunnerHandle::Get(); |
74 } | 76 } |
75 | 77 |
76 void SyncMessageFilter::OnChannelError() { | 78 void SyncMessageFilter::OnChannelError() { |
77 sender_ = NULL; | 79 sender_ = NULL; |
78 SignalAllEvents(); | 80 SignalAllEvents(); |
79 } | 81 } |
80 | 82 |
81 void SyncMessageFilter::OnChannelClosing() { | 83 void SyncMessageFilter::OnChannelClosing() { |
82 sender_ = NULL; | 84 sender_ = NULL; |
83 SignalAllEvents(); | 85 SignalAllEvents(); |
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
120 | 122 |
121 void SyncMessageFilter::SignalAllEvents() { | 123 void SyncMessageFilter::SignalAllEvents() { |
122 base::AutoLock auto_lock(lock_); | 124 base::AutoLock auto_lock(lock_); |
123 for (PendingSyncMessages::iterator iter = pending_sync_messages_.begin(); | 125 for (PendingSyncMessages::iterator iter = pending_sync_messages_.begin(); |
124 iter != pending_sync_messages_.end(); ++iter) { | 126 iter != pending_sync_messages_.end(); ++iter) { |
125 (*iter)->done_event->Signal(); | 127 (*iter)->done_event->Signal(); |
126 } | 128 } |
127 } | 129 } |
128 | 130 |
129 } // namespace IPC | 131 } // namespace IPC |
OLD | NEW |