Stop infinite restarting

session_manager_service.cc

 // Copyright (c) 2009-2010 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 "login_manager/session_manager_service.h"
 
 #include <errno.h>
 #include <glib.h>
 #include <grp.h>
 #include <sys/errno.h>
@@ skipping 180 matching lines @@
 
   g_main_loop_run(main_loop_);
 
   if (child_pid_ != 0)  // otherwise, we never created a child.
     CleanupChildren(3);
 
   return true;
 }
 
 int SessionManagerService::RunChild() {
+  child_job_->RecordTime();
   int pid = fork();
   if (pid == 0) {
     // In the child.
     child_job_->Run();
     exit(1);  // Run() is not supposed to return.
   }
   g_child_watch_add_full(G_PRIORITY_HIGH_IDLE,
                          pid,
                          HandleChildExit,
                          this,
@@ skipping 98 matching lines @@
     CHECK(WEXITSTATUS(status) != SetUidExecJob::kCantSetuid);
     CHECK(WEXITSTATUS(status) != SetUidExecJob::kCantExec);
   } else {
     DLOG(INFO) << "  Exited...somehow, without an exit code or a signal??";
   }
 
   bool exited_clean = WIFEXITED(status) && WEXITSTATUS(status) == 0;
 
   // If the child _ever_ exits uncleanly, we want to start it up again.
   SessionManagerService* manager = static_cast<SessionManagerService*>(data);
-  if (exited_clean) {
+  if (exited_clean || manager->should_stop_child()) {
     ServiceShutdown(data);
   } else if (manager->should_run_child()) {
     // TODO(cmasone): deal with fork failing in RunChild()
     LOG(INFO) << "Running the child again...";
     manager->set_child_pid(manager->RunChild());
   } else {
     LOG(INFO) << "Should NOT run";
     manager->AllowGracefulExit();
   }
 }
@@ skipping 67 matching lines @@
     system_->kill(child_pid_, SIGKILL);
 }
 
 void SessionManagerService::SetGError(GError** error,
                                       ChromeOSLoginError code,
                                       const char* message) {
   g_set_error(error, CHROMEOS_LOGIN_ERROR, code, "Login error: %s", message);
 }
 
 }  // namespace login_manager