Add multiplexing of message pipes in the new EDK.

mojo/edk/system/child_broker.h

Index: mojo/edk/system/child_broker.h
diff --git a/mojo/edk/system/child_broker.h b/mojo/edk/system/child_broker.h
index 689739a2c81d48d35efa64eeefbe11a1d674f037..7848fb3ff9f7e8a11cbd4893bff02cf92a8a6581 100644
--- a/mojo/edk/system/child_broker.h
+++ b/mojo/edk/system/child_broker.h
@@ -5,20 +5,27 @@
 #ifndef MOJO_EDK_SYSTEM_CHILD_BROKER_H_
 #define MOJO_EDK_SYSTEM_CHILD_BROKER_H_
 
+#include "base/compiler_specific.h"
+#include "base/containers/hash_tables.h"
+#include "base/macros.h"
 #include "base/memory/singleton.h"
+#include "base/process/process_handle.h"
 #include "base/synchronization/lock_impl.h"
 #include "mojo/edk/embedder/scoped_platform_handle.h"
 #include "mojo/edk/system/broker.h"
+#include "mojo/edk/system/raw_channel.h"
 #include "mojo/edk/system/system_impl_export.h"
 
 namespace mojo {
 namespace edk {
+class RoutedRawChannel;
 struct BrokerMessage;
 
 // An implementation of Broker used in (sandboxed) child processes. It talks
 // over sync IPCs to the (unsandboxed) parent process (specifically,
-// ParentBroker) to convert handles to tokens and vice versa.
-class MOJO_SYSTEM_IMPL_EXPORT ChildBroker : public Broker {
+// ChildBrokerHost) to convert handles to tokens and vice versa.

[yzshen1, 2015/12/03 23:37:50]

Please consider updating the comment since it doesn't just do sync IPCs anymore.

[jam, 2015/12/04 05:06:47]

Done.

+class MOJO_SYSTEM_IMPL_EXPORT ChildBroker
+    : public Broker, public RawChannel::Delegate {
  public:
   static ChildBroker* GetInstance();
 
@@ -36,6 +43,10 @@ class MOJO_SYSTEM_IMPL_EXPORT ChildBroker : public Broker {
                      size_t count,
                      PlatformHandle* handles) override;
 #endif
+  void ConnectMessagePipe(uint64_t pipe_id,
+                          MessagePipeDispatcher* message_pipe) override;
+  void CloseMessagePipe(uint64_t pipe_id,
+                        MessagePipeDispatcher* message_pipe) override;
 
  private:
   friend struct base::DefaultSingletonTraits<ChildBroker>;
@@ -43,17 +54,68 @@ class MOJO_SYSTEM_IMPL_EXPORT ChildBroker : public Broker {
   ChildBroker();
   ~ChildBroker() override;
 
+  // RawChannel::Delegate implementation:
+  void OnReadMessage(
+      const MessageInTransit::View& message_view,
+      ScopedPlatformHandleVectorPtr platform_handles) override;
+  void OnError(Error error) override;
+
+  // Callback for when a RoutedRawChannel is destroyed for cleanup.
+  void ChannelDestructed(RoutedRawChannel* channel);
+
+#if defined(OS_WIN)
   // Helper method to write the given message and read back the result.
   bool WriteAndReadResponse(BrokerMessage* message,
                             void* response,
                             uint32_t response_size);
 
+  void CreatePlatformChannelPairNoLock(ScopedPlatformHandle* server,
+                                       ScopedPlatformHandle* client);
+
+  // Pipe used for communication to the parent process. We use a pipe directly
+  // instead of bindings or RawChannel because we need to send synchronous
+  // messages with replies from any thread.
+  ScopedPlatformHandle parent_sync_channel_;
+#endif
+
+  // RawChannel used for asynchronous communication to and from the parent
+  // process. Since these messages are bidirectional, we can't use
+  // |parent_sync_channel_| which is only used for sync messages to the parent.
+  // However since the messages are asynchronous, we can use RawChannel for
+  // convenience instead of writing and reading from pipes manually. Although it
+  // would be convenient, we don't use Mojo IPC because it would be a layering
+  // violation (and cirular dependency) if the system layer depended on
+  // bindings.
+  RawChannel* parent_async_channel_;
+
   // Guards access to below.

[yzshen1, 2015/12/03 23:37:50]

I think |lock_| guards |parent_[a]sync_channel_| access too?

[jam, 2015/12/04 05:06:47]

Done.

   // We use LockImpl instead of Lock because the latter adds thread checking
   // that we don't want (since we lock in the constructor and unlock on another
   // thread.
   base::internal::LockImpl lock_;
-  ScopedPlatformHandle handle_;
+
+  // Maps from routing ids to the MessagePipeDispatcher that have requested to
+  // connect to them. When the parent replies with which process they should be
+  // connected to, they will migrate to |connected_pipes_|.
+  base::hash_map<uint64_t, MessagePipeDispatcher*> pending_connects_;
+
+  // Map from MessagePipeDispatcher to its RoutedRawChannel. This is needed so
+  // that when a MessagePipeDispatcher is closed we can remove the route for the
+  // corresponding RoutedRawChannel.
+  // Note the key is MessagePipeDispatcher*, instead of pipe_id, because when
+  // the two pipes are in the same process they will have one pipe_id but be
+  // connected to the two RoutedRawChannel objects below.
+  base::hash_map<MessagePipeDispatcher*, RoutedRawChannel*> connected_pipes_;
+
+  // Holds a map of all the RoutedRawChannel that connect this child process to
+  // any other process. The key is the peer process'd pid.
+  base::hash_map<base::ProcessId, RoutedRawChannel*> channels_;
+
+  // Used for message pipes in the same process.
+  RoutedRawChannel* in_process_pipes_channel1_;
+  RoutedRawChannel* in_process_pipes_channel2_;
+
+  DISALLOW_COPY_AND_ASSIGN(ChildBroker);
 };
 
 }  // namespace edk