diff options
| author | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-16 00:57:03 +0000 |
|---|---|---|
| committer | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-16 00:57:03 +0000 |
| commit | 075cfa198bff8cc93a3ab7ca45c3c75125617a70 (patch) | |
| tree | 800fd107e8e163b00624046ddb2be466030df872 /chrome/browser/process_singleton_linux.cc | |
| parent | b1957da6db535df75ec0b264bc9ddabb6b2b6243 (diff) | |
| download | chromium_src-075cfa198bff8cc93a3ab7ca45c3c75125617a70.zip chromium_src-075cfa198bff8cc93a3ab7ca45c3c75125617a70.tar.gz chromium_src-075cfa198bff8cc93a3ab7ca45c3c75125617a70.tar.bz2 | |
ProcessSingletonLinux: Allow kill to fail with "no such process".
BUG=40946
TEST=SessionRestoreUITest.FLAKY_RestoreAfterClosingTabbedBrowserWithAppAndLaunching
Review URL: http://codereview.chromium.org/1521034
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44725 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/process_singleton_linux.cc')
| -rw-r--r-- | chrome/browser/process_singleton_linux.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/browser/process_singleton_linux.cc b/chrome/browser/process_singleton_linux.cc index a012aea..0a9a427 100644 --- a/chrome/browser/process_singleton_linux.cc +++ b/chrome/browser/process_singleton_linux.cc @@ -297,7 +297,9 @@ bool KillProcessByLockPath(const std::string& path) { if (pid >= 0) { // TODO(james.su@gmail.com): Is SIGKILL ok? int rv = kill(static_cast<base::ProcessHandle>(pid), SIGKILL); - DCHECK_EQ(0, rv) << "Error killing process: " << safe_strerror(errno); + // ESRCH = No Such Process (can happen if the other process is already in + // progress of shutting down and finishes before we try to kill it). + DCHECK(rv == 0 || errno == ESRCH) << "Error killing process: " << safe_strerror(errno); return true; } |