NOT FOR COMMIT loop gpu init crash

mojo/edk/system/node_controller.cc

Index: mojo/edk/system/node_controller.cc
diff --git a/mojo/edk/system/node_controller.cc b/mojo/edk/system/node_controller.cc
index 7c6c1516a669abd88dca33ab464439dfbe1e477f..34d7afa2b422ea1d135725358d8016198bf6c64f 100644
--- a/mojo/edk/system/node_controller.cc
+++ b/mojo/edk/system/node_controller.cc
@@ -209,6 +209,8 @@ void NodeController::ConnectToChild(
 }
 
 void NodeController::CloseChildPorts(const std::string& child_token) {
+if (g_extra_debugging)
+  LOG(ERROR) << "boliu NodeController::CloseChildPorts token:" << child_token;
   std::vector<ports::PortRef> ports_to_close;
   {
     std::vector<std::string> port_tokens;
@@ -296,7 +298,8 @@ int NodeController::SendMessage(const ports::PortRef& port,
 void NodeController::ReservePort(const std::string& token,
                                  const ports::PortRef& port,
                                  const std::string& child_token) {
-  DVLOG(2) << "Reserving port " << port.name() << "@" << name_ << " for token "
+if (g_extra_debugging)
+  LOG(ERROR) << "boliu NodeController::ReservePort Reserving port " << port.name() << "@" << name_ << " for token "
            << token;
 
   base::AutoLock lock(reserved_ports_lock_);
@@ -1093,24 +1096,27 @@ void NodeController::OnRequestPortMerge(
     const std::string& token) {
   DCHECK(io_task_runner_->RunsTasksOnCurrentThread());
 
-  DVLOG(2) << "Node " << name_ << " received RequestPortMerge for token "
-           << token << " and port " << connector_port_name << "@" << from_node;
+if (g_extra_debugging)
+  LOG(ERROR) << "boliu NodeController::OnRequestPortMerge Node " << name_ << " received RequestPortMerge for token "
+         << token << " and port " << connector_port_name << "@" << from_node;
 
   ports::PortRef local_port;
   {
     base::AutoLock lock(reserved_ports_lock_);
     auto it = reserved_ports_.find(token);
     if (it == reserved_ports_.end()) {
-      DVLOG(1) << "Ignoring request to connect to port for unknown token "
-               << token;
+
+if (g_extra_debugging)
+LOG(ERROR) << "boliu Ignoring request to connect to port for unknown token "
+         << token;
       return;
     }
     local_port = it->second.port;
   }
 
   int rv = node_->MergePorts(local_port, from_node, connector_port_name);
-  if (rv != ports::OK)
-    DLOG(ERROR) << "MergePorts failed: " << rv;
+if (rv != ports::OK && g_extra_debugging)
+  LOG(ERROR) << "boliu MergePorts failed: " << rv;
 
   AcceptIncomingMessages();
 }