diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-18 20:38:50 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-18 20:38:50 +0000 |
| commit | e0c5aaae87c949986cb3b5cc0b4e46d9b4d5560b (patch) | |
| tree | 3768222f175fbc2d5cbfe435fa93a2411adb448c /base | |
| parent | 800bb46fd0494d613685ec1fd8c458901c19b58f (diff) | |
| download | chromium_src-e0c5aaae87c949986cb3b5cc0b4e46d9b4d5560b.zip chromium_src-e0c5aaae87c949986cb3b5cc0b4e46d9b4d5560b.tar.gz chromium_src-e0c5aaae87c949986cb3b5cc0b4e46d9b4d5560b.tar.bz2 | |
Merge 32264 - Launch processes asynchronously so as not to block the UI thread. For now, renderer only, I'll take care of plugin/worker/utility processes in a followup change. (relanding 32203)
BUG=6844,27935
Review URL: http://codereview.chromium.org/397031
TBR=jam@chromium.org
Review URL: http://codereview.chromium.org/408011
git-svn-id: svn://svn.chromium.org/chrome/branches/249/src@32388 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
| -rw-r--r-- | base/process_util_posix.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/base/process_util_posix.cc b/base/process_util_posix.cc index bfcd739..1148f6e 100644 --- a/base/process_util_posix.cc +++ b/base/process_util_posix.cc @@ -126,11 +126,9 @@ ProcessId GetProcId(ProcessHandle process) { // entry structure. Ignores specified exit_code; posix can't force that. // Returns true if this is successful, false otherwise. bool KillProcess(ProcessHandle process_id, int exit_code, bool wait) { - DCHECK(process_id > 1); - if (process_id <= 1) { - LOG(ERROR) << "tried to kill process_id " << process_id; + DCHECK_GT(process_id, 1) << " tried to kill invalid process_id"; + if (process_id <= 1) return false; - } bool result = kill(process_id, SIGTERM) == 0; |