mash: Exit main process if ui service crashes

chrome/app/mash/mash_runner.cc

 // 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.
 
 #include "chrome/app/mash/mash_runner.h"
 
 #include <string>
 
 #include "base/at_exit.h"
 #include "base/base_paths.h"
@@ skipping 32 matching lines @@
 #include "services/service_manager/background/background_service_manager.h"
 #include "services/service_manager/public/cpp/connector.h"
 #include "services/service_manager/public/cpp/identity.h"
 #include "services/service_manager/public/cpp/service.h"
 #include "services/service_manager/public/cpp/service_context.h"
 #include "services/service_manager/public/cpp/standalone_service/standalone_service.h"
 #include "services/service_manager/public/interfaces/service_factory.mojom.h"
 #include "services/service_manager/runner/common/client_util.h"
 #include "services/service_manager/runner/common/switches.h"
 #include "services/service_manager/runner/init.h"
+#include "services/ui/public/interfaces/constants.mojom.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_paths.h"
 #include "ui/base/ui_base_switches.h"
 
 #if defined(OS_CHROMEOS)
 #include "base/debug/leak_annotations.h"
 #include "chrome/app/mash/mash_crash_reporter_client.h"
 #include "components/crash/content/app/breakpad_linux.h" // nogncheck
 #endif
 
@@ skipping 85 matching lines @@
 #endif  // defined(OS_CHROMEOS)
 
 // Quits |run_loop| if the |identity| of the quitting service is critical to the
 // system (e.g. the window manager). Used in the main process.
 void OnInstanceQuitInMain(base::RunLoop* run_loop,
                           int* exit_value,
                           const service_manager::Identity& identity) {
   DCHECK(exit_value);
   DCHECK(run_loop);
 
-  // TODO(jamescook): Also shut down if the window server dies.
-  if (identity.name() != mash::common::GetWindowManagerServiceName())
+  if (identity.name() != mash::common::GetWindowManagerServiceName() &&
+      identity.name() != ui::mojom::kServiceName) {
     return;
+  }
 
-  if (!run_loop->running())

[James Cook, 2017/02/01 18:19:54]

This wasn't needed. RunLoop::Quit() is a no-op if the loop isn't running.

[Ken Rockot(use gerrit already), 2017/02/01 21:13:55]

Ah right, missed this. In fact, it's also not possible (AFAICT) for this to be
false since the function is only ever invoked as a task on the loop, and tasks
are never run while !running(). I think?

[James Cook, 2017/02/01 21:26:51]

Acknowledged.

-    return;
-
+  LOG(ERROR) << "Main process exiting because service " << identity.name()
+             << " quit unexpectedly.";
   *exit_value = 1;
   run_loop->Quit();
 }
 
 }  // namespace
 
 MashRunner::MashRunner() {}
 
 MashRunner::~MashRunner() {}
 
@@ skipping 42 matching lines @@
           kChromeMashServiceName, service_manager::mojom::kRootUserID),
       std::move(service), nullptr);
 
   // Quit the main process if an important child (e.g. window manager) dies.
   // On Chrome OS the OS-level session_manager will restart the main process.
   base::RunLoop run_loop;
   int exit_value = 0;
   background_service_manager.SetInstanceQuitCallback(
       base::Bind(&OnInstanceQuitInMain, &run_loop, &exit_value));
 
-  // Ping services that we know we want to launch on startup.
-  // TODO(jamescook): Start the window server / ui service explicitly.
+  // Ping services that we know we want to launch on startup (UI service,
+  // window manager, quick launch app).
+  context_->connector()->Connect(ui::mojom::kServiceName);
   context_->connector()->Connect(mash::common::GetWindowManagerServiceName());
   context_->connector()->Connect(mash::quick_launch::mojom::kServiceName);
 
   run_loop.Run();
 
   context_.reset();
   return exit_value;
 }
 
 int MashRunner::RunChild() {
@@ skipping 74 matching lines @@
       command_line->GetSwitchValueASCII(switches::kWaitForDebugger)) {
     return;
   }
 
   // Include the pid as logging may not have been initialized yet (the pid
   // printed out by logging is wrong).
   LOG(WARNING) << "waiting for debugger to attach for service " << service_name
                << " pid=" << base::Process::Current().Pid();
   base::debug::WaitForDebugger(120, true);
 }