[mojo-edk] Close pending merges if the parent channel dies.

mojo/edk/system/node_controller.h

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef MOJO_EDK_SYSTEM_NODE_CONTROLLER_H_
 #define MOJO_EDK_SYSTEM_NODE_CONTROLLER_H_
 
 #include <memory>
 #include <queue>
 #include <unordered_map>
@@ skipping 135 matching lines @@
       const ProcessErrorCallback& process_error_callback);
   void ConnectToParentOnIOThread(ScopedPlatformHandle platform_handle);
 
   scoped_refptr<NodeChannel> GetPeerChannel(const ports::NodeName& name);
   scoped_refptr<NodeChannel> GetParentChannel();
   scoped_refptr<NodeChannel> GetBrokerChannel();
 
   void AddPeer(const ports::NodeName& name,
                scoped_refptr<NodeChannel> channel,
                bool start_channel);
-  void DropPeer(const ports::NodeName& name);
+  void DropPeer(const ports::NodeName& name, NodeChannel* channel);
   void SendPeerMessage(const ports::NodeName& name,
                        ports::ScopedMessage message);
   void AcceptIncomingMessages();
   void ProcessIncomingMessages();
   void DropAllPeers();
 
   // ports::NodeDelegate:
   void GenerateRandomPortName(ports::PortName* port_name) override;
   void AllocMessage(size_t num_header_bytes,
                     ports::ScopedMessage* message) override;
@@ skipping 32 matching lines @@
                    Channel::MessagePtr message) override;
 #if defined(OS_WIN) || (defined(OS_MACOSX) && !defined(OS_IOS))
   void OnRelayPortsMessage(const ports::NodeName& from_node,
                            base::ProcessHandle from_process,
                            const ports::NodeName& destination,
                            Channel::MessagePtr message) override;
   void OnPortsMessageFromRelay(const ports::NodeName& from_node,
                                const ports::NodeName& source_node,
                                Channel::MessagePtr message) override;
 #endif
-  void OnChannelError(const ports::NodeName& from_node) override;
+  void OnChannelError(const ports::NodeName& from_node,
+                      NodeChannel* channel) override;
 #if defined(OS_MACOSX) && !defined(OS_IOS)
   MachPortRelay* GetMachPortRelay() override;
 #endif
 
   // Marks this NodeController for destruction when the IO thread shuts down.
   // This is used in case Core is torn down before the IO thread. Must only be
   // called on the IO thread.
   void DestroyOnIOThreadShutdown();
 
   // If there is a registered shutdown callback (meaning shutdown has been
@@ skipping 19 matching lines @@
 
   // Guards |reserved_ports_| and |pending_child_tokens_|.
   base::Lock reserved_ports_lock_;
 
   // Ports reserved by token. Key is the port token.
   base::hash_map<std::string, ReservedPort> reserved_ports_;
   // TODO(amistry): This _really_ needs to be a bimap. Unfortunately, we don't
   // have one yet :(
   std::unordered_map<ports::NodeName, std::string> pending_child_tokens_;
 
-  // Guards |pending_port_merges_|.
+  // Guards |pending_port_merges_| and |reject_pending_merges_|.
   base::Lock pending_port_merges_lock_;
 
   // A set of port merge requests awaiting parent connection.
   std::vector<std::pair<std::string, ports::PortRef>> pending_port_merges_;
 
+  // Indicates that new merge requests should be rejected because the parent has
+  // disconnected.
+  bool reject_pending_merges_ = false;
+
   // Guards |parent_name_| and |bootstrap_parent_channel_|.
   base::Lock parent_lock_;
 
   // The name of our parent node, if any.
   ports::NodeName parent_name_;
 
   // A temporary reference to the parent channel before we know their name.
   scoped_refptr<NodeChannel> bootstrap_parent_channel_;
 
   // Guards |broker_name_|, |pending_broker_clients_|, and
@@ skipping 47 matching lines @@
   std::unique_ptr<MachPortRelay> mach_port_relay_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(NodeController);
 };
 
 }  // namespace edk
 }  // namespace mojo
 
 #endif  // MOJO_EDK_SYSTEM_NODE_CONTROLLER_H_