summaryrefslogtreecommitdiffstats
path: root/chrome/app/chrome_dll_main.cc
diff options
context:
space:
mode:
authordkegel@google.com <dkegel@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-06 19:59:36 +0000
committerdkegel@google.com <dkegel@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-06 19:59:36 +0000
commit4883a4e4209bab557f4ba40a002936acf755205f (patch)
tree8b1aef5a4e1fe01ee5d4e178838dec8e98356177 /chrome/app/chrome_dll_main.cc
parente2ffeae017f1c85d472e3f04e62e4cba21f6e9a8 (diff)
downloadchromium_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 'chrome/app/chrome_dll_main.cc')
-rw-r--r--chrome/app/chrome_dll_main.cc15
1 files changed, 15 insertions, 0 deletions
diff --git a/chrome/app/chrome_dll_main.cc b/chrome/app/chrome_dll_main.cc
index 006d923..b6ba22f 100644
--- a/chrome/app/chrome_dll_main.cc
+++ b/chrome/app/chrome_dll_main.cc
@@ -45,6 +45,9 @@
#if defined(OS_WIN)
#include "base/win_util.h"
#endif
+#if defined(OS_LINUX)
+#include "base/zygote_manager.h"
+#endif
#if defined(OS_MACOSX)
#include "chrome/app/breakpad_mac.h"
#elif defined(OS_LINUX)
@@ -292,6 +295,18 @@ int ChromeMain(int argc, const char** argv) {
// Initialize the command line.
#if defined(OS_WIN)
CommandLine::Init(0, NULL);
+#elif defined(OS_LINUX)
+ base::ZygoteManager* zm = base::ZygoteManager::Get();
+ std::vector<std::string>* zargv = NULL;
+ if (zm)
+ zargv = zm->Start();
+ if (zargv) {
+ // Forked child.
+ CommandLine::Init(*zargv);
+ } else {
+ // Original process.
+ CommandLine::Init(argc, argv);
+ }
#else
CommandLine::Init(argc, argv);
#endif