diff options
| author | kkania@chromium.org <kkania@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-05 02:41:38 +0000 |
|---|---|---|
| committer | kkania@chromium.org <kkania@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-05 02:41:38 +0000 |
| commit | cd69619bc053d527b7c82aac81c605157b28d01f (patch) | |
| tree | f5a50afb86bd0ee0e0dae9a23213dcfaf1b9105e /chrome/browser/zygote_host_linux.cc | |
| parent | 980dbfd913c463f5fa8f1b5943327fe5e4799b20 (diff) | |
| download | chromium_src-cd69619bc053d527b7c82aac81c605157b28d01f.zip chromium_src-cd69619bc053d527b7c82aac81c605157b28d01f.tar.gz chromium_src-cd69619bc053d527b7c82aac81c605157b28d01f.tar.bz2 | |
Revert 46384 - Fix race in zygote_host_linux where socket was being read from and written to on different threads.
Made ZygoteHost methods all run on PROCESS_LAUNCHER thread. PostTask in linux from UI thread to PROCESS_LAUNCHER thread for DidProcessCrash. Changed DidProcessCrash to answer via a callback, which occurs asynchronously on linux. Rework cases in nacl_host, browser_render_process_host, and child_process_host where this method was being called to fit the callback model.
BUG=31737
TEST=none
Review URL: http://codereview.chromium.org/1695026
TBR=kkania@chromium.org
Review URL: http://codereview.chromium.org/1933007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46429 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/zygote_host_linux.cc')
| -rw-r--r-- | chrome/browser/zygote_host_linux.cc | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/chrome/browser/zygote_host_linux.cc b/chrome/browser/zygote_host_linux.cc index f28e2ad..9885234 100644 --- a/chrome/browser/zygote_host_linux.cc +++ b/chrome/browser/zygote_host_linux.cc @@ -19,7 +19,6 @@ #include "base/string_util.h" #include "base/unix_domain_socket_posix.h" -#include "chrome/browser/chrome_thread.h" #include "chrome/browser/renderer_host/render_sandbox_host_linux.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_switches.h" @@ -194,7 +193,6 @@ void ZygoteHost::Init(const std::string& sandbox_cmd) { pid_t ZygoteHost::ForkRenderer( const std::vector<std::string>& argv, const base::GlobalDescriptors::Mapping& mapping) { - DCHECK(ChromeThread::CurrentlyOn(ChromeThread::PROCESS_LAUNCHER)); DCHECK(init_); Pickle pickle; @@ -243,7 +241,6 @@ pid_t ZygoteHost::ForkRenderer( } void ZygoteHost::EnsureProcessTerminated(pid_t process) { - DCHECK(ChromeThread::CurrentlyOn(ChromeThread::PROCESS_LAUNCHER)); DCHECK(init_); Pickle pickle; @@ -256,7 +253,6 @@ void ZygoteHost::EnsureProcessTerminated(pid_t process) { bool ZygoteHost::DidProcessCrash(base::ProcessHandle handle, bool* child_exited) { - DCHECK(ChromeThread::CurrentlyOn(ChromeThread::PROCESS_LAUNCHER)); DCHECK(init_); Pickle pickle; pickle.WriteInt(kCmdDidProcessCrash); |