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

Unified 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, 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ipc/ipc_sync_message_filter.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ipc/ipc_sync_message_filter.cc
diff --git a/ipc/ipc_sync_message_filter.cc b/ipc/ipc_sync_message_filter.cc
index 6a408ec12cf3b044f2426da46f659d640bec9e6d..d86835d11973ec5427cd7a461652fc32dbf06ae9 100644
--- a/ipc/ipc_sync_message_filter.cc
+++ b/ipc/ipc_sync_message_filter.cc
@@ -22,15 +22,14 @@ SyncMessageFilter::SyncMessageFilter(base::WaitableEvent* shutdown_event)
}
bool SyncMessageFilter::Send(Message* message) {
- {
- base::AutoLock auto_lock(lock_);
- if (!io_task_runner_.get()) {
- delete message;
- return false;
- }
- }
-
if (!message->is_sync()) {
+ {
+ base::AutoLock auto_lock(lock_);
+ if (!io_task_runner_.get()) {
+ pending_messages_.push_back(message);
+ return true;
+ }
+ }
io_task_runner_->PostTask(
FROM_HERE,
base::Bind(&SyncMessageFilter::SendOnIOThread, this, message));
@@ -52,10 +51,15 @@ bool SyncMessageFilter::Send(Message* message) {
DCHECK(base::ThreadTaskRunnerHandle::Get() != io_task_runner_);
}
pending_sync_messages_.insert(&pending_message);
- }
- io_task_runner_->PostTask(
- FROM_HERE, base::Bind(&SyncMessageFilter::SendOnIOThread, this, message));
+ if (io_task_runner_.get()) {
+ io_task_runner_->PostTask(
+ FROM_HERE,
+ base::Bind(&SyncMessageFilter::SendOnIOThread, this, message));
+ } else {
+ pending_messages_.push_back(message);
+ }
+ }
base::WaitableEvent* events[2] = { shutdown_event_, &done_event };
base::WaitableEvent::WaitMany(events, 2);
@@ -71,8 +75,14 @@ bool SyncMessageFilter::Send(Message* message) {
void SyncMessageFilter::OnFilterAdded(Sender* sender) {
sender_ = sender;
- base::AutoLock auto_lock(lock_);
- io_task_runner_ = base::ThreadTaskRunnerHandle::Get();
+ std::vector<Message*> pending_messages;
+ {
+ base::AutoLock auto_lock(lock_);
+ io_task_runner_ = base::ThreadTaskRunnerHandle::Get();
+ pending_messages_.release(&pending_messages);
+ }
+ for (auto* msg : pending_messages)
+ SendOnIOThread(msg);
}
void SyncMessageFilter::OnChannelError() {
« 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