Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(76)

Side by Side Diff: ipc/ipc_sync_message_filter.cc

Issue 1261253002: Add waitable event for SyncMessageFilter init (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: sender_ check Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « ipc/ipc_sync_message_filter.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/single_thread_task_runner.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 "base/thread_task_runner_handle.h"
13 #include "ipc/ipc_channel.h" 13 #include "ipc/ipc_channel.h"
14 #include "ipc/ipc_sync_message.h" 14 #include "ipc/ipc_sync_message.h"
15 15
16 namespace IPC { 16 namespace IPC {
17 17
18 SyncMessageFilter::SyncMessageFilter(base::WaitableEvent* shutdown_event) 18 SyncMessageFilter::SyncMessageFilter(base::WaitableEvent* shutdown_event)
19 : sender_(NULL), 19 : sender_(NULL),
20 listener_task_runner_(base::ThreadTaskRunnerHandle::Get()), 20 listener_task_runner_(base::ThreadTaskRunnerHandle::Get()),
21 shutdown_event_(shutdown_event) { 21 shutdown_event_(shutdown_event) {
22 } 22 }
23 23
24 bool SyncMessageFilter::Send(Message* message) { 24 bool SyncMessageFilter::Send(Message* message) {
25 { 25 if (!message->is_sync()) {
26 base::AutoLock auto_lock(lock_); 26 {
27 if (!io_task_runner_.get()) { 27 base::AutoLock auto_lock(lock_);
28 delete message; 28 if (!io_task_runner_.get()) {
29 return false; 29 pending_messages_.push_back(message);
30 return true;
31 }
30 } 32 }
31 }
32
33 if (!message->is_sync()) {
34 io_task_runner_->PostTask( 33 io_task_runner_->PostTask(
35 FROM_HERE, 34 FROM_HERE,
36 base::Bind(&SyncMessageFilter::SendOnIOThread, this, message)); 35 base::Bind(&SyncMessageFilter::SendOnIOThread, this, message));
37 return true; 36 return true;
38 } 37 }
39 38
40 base::WaitableEvent done_event(true, false); 39 base::WaitableEvent done_event(true, false);
41 PendingSyncMsg pending_message( 40 PendingSyncMsg pending_message(
42 SyncMessage::GetMessageId(*message), 41 SyncMessage::GetMessageId(*message),
43 static_cast<SyncMessage*>(message)->GetReplyDeserializer(), 42 static_cast<SyncMessage*>(message)->GetReplyDeserializer(),
44 &done_event); 43 &done_event);
45 44
46 { 45 {
47 base::AutoLock auto_lock(lock_); 46 base::AutoLock auto_lock(lock_);
48 // Can't use this class on the main thread or else it can lead to deadlocks. 47 // 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. 48 // Also by definition, can't use this on IO thread since we're blocking it.
50 if (base::ThreadTaskRunnerHandle::IsSet()) { 49 if (base::ThreadTaskRunnerHandle::IsSet()) {
51 DCHECK(base::ThreadTaskRunnerHandle::Get() != listener_task_runner_); 50 DCHECK(base::ThreadTaskRunnerHandle::Get() != listener_task_runner_);
52 DCHECK(base::ThreadTaskRunnerHandle::Get() != io_task_runner_); 51 DCHECK(base::ThreadTaskRunnerHandle::Get() != io_task_runner_);
53 } 52 }
54 pending_sync_messages_.insert(&pending_message); 53 pending_sync_messages_.insert(&pending_message);
54
55 if (io_task_runner_.get()) {
56 io_task_runner_->PostTask(
57 FROM_HERE,
58 base::Bind(&SyncMessageFilter::SendOnIOThread, this, message));
59 } else {
60 pending_messages_.push_back(message);
61 }
55 } 62 }
56 63
57 io_task_runner_->PostTask(
58 FROM_HERE, base::Bind(&SyncMessageFilter::SendOnIOThread, this, message));
59
60 base::WaitableEvent* events[2] = { shutdown_event_, &done_event }; 64 base::WaitableEvent* events[2] = { shutdown_event_, &done_event };
61 base::WaitableEvent::WaitMany(events, 2); 65 base::WaitableEvent::WaitMany(events, 2);
62 66
63 { 67 {
64 base::AutoLock auto_lock(lock_); 68 base::AutoLock auto_lock(lock_);
65 delete pending_message.deserializer; 69 delete pending_message.deserializer;
66 pending_sync_messages_.erase(&pending_message); 70 pending_sync_messages_.erase(&pending_message);
67 } 71 }
68 72
69 return pending_message.send_result; 73 return pending_message.send_result;
70 } 74 }
71 75
72 void SyncMessageFilter::OnFilterAdded(Sender* sender) { 76 void SyncMessageFilter::OnFilterAdded(Sender* sender) {
73 sender_ = sender; 77 sender_ = sender;
74 base::AutoLock auto_lock(lock_); 78 std::vector<Message*> pending_messages;
75 io_task_runner_ = base::ThreadTaskRunnerHandle::Get(); 79 {
80 base::AutoLock auto_lock(lock_);
81 io_task_runner_ = base::ThreadTaskRunnerHandle::Get();
82 pending_messages_.release(&pending_messages);
83 }
84 for (auto* msg : pending_messages)
85 SendOnIOThread(msg);
76 } 86 }
77 87
78 void SyncMessageFilter::OnChannelError() { 88 void SyncMessageFilter::OnChannelError() {
79 sender_ = NULL; 89 sender_ = NULL;
80 SignalAllEvents(); 90 SignalAllEvents();
81 } 91 }
82 92
83 void SyncMessageFilter::OnChannelClosing() { 93 void SyncMessageFilter::OnChannelClosing() {
84 sender_ = NULL; 94 sender_ = NULL;
85 SignalAllEvents(); 95 SignalAllEvents();
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 132
123 void SyncMessageFilter::SignalAllEvents() { 133 void SyncMessageFilter::SignalAllEvents() {
124 base::AutoLock auto_lock(lock_); 134 base::AutoLock auto_lock(lock_);
125 for (PendingSyncMessages::iterator iter = pending_sync_messages_.begin(); 135 for (PendingSyncMessages::iterator iter = pending_sync_messages_.begin();
126 iter != pending_sync_messages_.end(); ++iter) { 136 iter != pending_sync_messages_.end(); ++iter) {
127 (*iter)->done_event->Signal(); 137 (*iter)->done_event->Signal();
128 } 138 }
129 } 139 }
130 140
131 } // namespace IPC 141 } // namespace IPC
OLDNEW
« no previous file with comments | « ipc/ipc_sync_message_filter.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698