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

Unified Diff: ipc/ipc_sync_message_filter.h

Issue 2101163002: Reland Mojo-based waiting for IPC::SyncChannel (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 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.cc ('k') | ipc/ipc_sync_message_filter.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ipc/ipc_sync_message_filter.h
diff --git a/ipc/ipc_sync_message_filter.h b/ipc/ipc_sync_message_filter.h
index 27584359ece7918f11bc62556201f2813ad70b15..dead5b329265e09f0264d055a03be148d281577a 100644
--- a/ipc/ipc_sync_message_filter.h
+++ b/ipc/ipc_sync_message_filter.h
@@ -6,14 +6,17 @@
#define IPC_IPC_SYNC_MESSAGE_FILTER_H_
#include <set>
+#include <vector>
#include "base/macros.h"
#include "base/memory/ref_counted.h"
-#include "base/memory/scoped_vector.h"
+#include "base/memory/weak_ptr.h"
#include "base/synchronization/lock.h"
+#include "base/synchronization/waitable_event_watcher.h"
#include "ipc/ipc_sender.h"
#include "ipc/ipc_sync_message.h"
#include "ipc/message_filter.h"
+#include "ipc/mojo_event.h"
namespace base {
class SingleThreadTaskRunner;
@@ -46,7 +49,10 @@ class IPC_EXPORT SyncMessageFilter : public MessageFilter, public Sender {
~SyncMessageFilter() override;
private:
+ class IOMessageLoopObserver;
+
friend class SyncChannel;
+ friend class IOMessageLoopObserver;
void set_is_channel_send_thread_safe(bool is_channel_send_thread_safe) {
is_channel_send_thread_safe_ = is_channel_send_thread_safe;
@@ -56,6 +62,9 @@ class IPC_EXPORT SyncMessageFilter : public MessageFilter, public Sender {
// Signal all the pending sends as done, used in an error condition.
void SignalAllEvents();
+ void OnShutdownEventSignaled(base::WaitableEvent* event);
+ void OnIOMessageLoopDestroyed();
+
// The channel to which this filter was added.
Sender* sender_;
@@ -72,12 +81,24 @@ class IPC_EXPORT SyncMessageFilter : public MessageFilter, public Sender {
PendingSyncMessages pending_sync_messages_;
// Messages waiting to be delivered after IO initialization.
- ScopedVector<Message> pending_messages_;
+ std::vector<std::unique_ptr<Message>> pending_messages_;
// Locks data members above.
base::Lock lock_;
- base::WaitableEvent* shutdown_event_;
+ base::WaitableEvent* const shutdown_event_;
+
+ // Used to asynchronously watch |shutdown_event_| on the IO thread and forward
+ // to |shutdown_mojo_event_| (see below.)
+ base::WaitableEventWatcher shutdown_watcher_;
+
+ // A Mojo event which can be watched for shutdown. Signals are forwarded to
+ // this event asynchronously from |shutdown_event_|.
+ MojoEvent shutdown_mojo_event_;
+
+ scoped_refptr<IOMessageLoopObserver> io_message_loop_observer_;
+
+ base::WeakPtrFactory<SyncMessageFilter> weak_factory_;
DISALLOW_COPY_AND_ASSIGN(SyncMessageFilter);
};
« no previous file with comments | « ipc/ipc_sync_message.cc ('k') | ipc/ipc_sync_message_filter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698