diff options
author | dkegel@google.com <dkegel@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-06 19:59:36 +0000 |
---|---|---|
committer | dkegel@google.com <dkegel@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-06 19:59:36 +0000 |
commit | 4883a4e4209bab557f4ba40a002936acf755205f (patch) | |
tree | 8b1aef5a4e1fe01ee5d4e178838dec8e98356177 /base/process_util_linux.cc | |
parent | e2ffeae017f1c85d472e3f04e62e4cba21f6e9a8 (diff) | |
download | chromium_src-4883a4e4209bab557f4ba40a002936acf755205f.zip chromium_src-4883a4e4209bab557f4ba40a002936acf755205f.tar.gz chromium_src-4883a4e4209bab557f4ba40a002936acf755205f.tar.bz2 |
Prototype implementation of zygotes.
Limitations that need addressing still:
- Doesn't forcibly terminate children that should have exited but haven't
Enable with env var ENABLE_ZYGOTE_MANAGER=1.
BUG=11841
TEST=
start the browser, then make chrome and all .pak files unreadable; or alternately, start an installed browser, and uninstall the browser while it's running. Then create a new tab and browse to two new sites.
Here's an example script to hide and unhide the .pak files (note: do not move the directory they're in, that doesn't work):
#!/bin/sh
chmod_all() {
chmod $1 sconsbuild/Debug/chrome
for path in . locales obj/chrome/app/intermediate/repack obj/global_intermediate/* themes
do
chmod $1 sconsbuild/Debug/$path/*.pak
done
}
case $1 in
hide) chmod_all 000 ;;
show) chmod_all 755 ;;
esac
Review URL: http://codereview.chromium.org/115773
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17840 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/process_util_linux.cc')
-rw-r--r-- | base/process_util_linux.cc | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/base/process_util_linux.cc b/base/process_util_linux.cc index ed8d32d..78725cc 100644 --- a/base/process_util_linux.cc +++ b/base/process_util_linux.cc @@ -17,6 +17,7 @@ #include "base/logging.h" #include "base/string_tokenizer.h" #include "base/string_util.h" +#include "base/zygote_manager.h" namespace { @@ -41,6 +42,22 @@ void GetProcStats(pid_t pid, std::vector<std::string>* proc_stats) { namespace base { +bool ForkApp(const std::vector<std::string>& argv, + const file_handle_mapping_vector& fds_to_remap, + ProcessHandle* process_handle) { + ZygoteManager* zm = ZygoteManager::Get(); + if (!zm) + return LaunchApp(argv, fds_to_remap, false, process_handle); + + pid_t pid = zm->LongFork(argv, fds_to_remap); + if (pid < 0) + return false; + + if (process_handle) + *process_handle = pid; + return true; +} + bool LaunchApp(const std::vector<std::string>& argv, const file_handle_mapping_vector& fds_to_remap, bool wait, ProcessHandle* process_handle) { @@ -65,6 +82,8 @@ bool LaunchApp(const std::vector<std::string>& argv, argv_cstr[i] = const_cast<char*>(argv[i].c_str()); argv_cstr[argv.size()] = NULL; execvp(argv_cstr[0], argv_cstr.get()); + LOG(ERROR) << "LaunchApp: exec failed!, argv_cstr[0] " << argv_cstr[0] + << ", errno " << errno; exit(127); } else { if (wait) |