diff options
| author | bradchen@google.com <bradchen@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-16 00:42:48 +0000 |
|---|---|---|
| committer | bradchen@google.com <bradchen@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-16 00:42:48 +0000 |
| commit | b1ce36509d8114cca9a65abaa590a11f9ce89b62 (patch) | |
| tree | ab3f34eb43b3241023f5765d62711e108739118b /content/app/content_main_runner.cc | |
| parent | 0a12d5fdc9b861f48e0d431fa9f1887bf84246b1 (diff) | |
| download | chromium_src-b1ce36509d8114cca9a65abaa590a11f9ce89b62.zip chromium_src-b1ce36509d8114cca9a65abaa590a11f9ce89b62.tar.gz chromium_src-b1ce36509d8114cca9a65abaa590a11f9ce89b62.tar.bz2 | |
Refactor fetching of browser_pid.
Eliminates some duplicated code and avoids attempts to do disallowed operations within the Linux SUID sandbox.
BUG=126163
TEST=browser_tests
Review URL: https://chromiumcodereview.appspot.com/10404002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@137321 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/app/content_main_runner.cc')
| -rw-r--r-- | content/app/content_main_runner.cc | 60 |
1 files changed, 35 insertions, 25 deletions
diff --git a/content/app/content_main_runner.cc b/content/app/content_main_runner.cc index d2a1b80..157e862 100644 --- a/content/app/content_main_runner.cc +++ b/content/app/content_main_runner.cc @@ -167,8 +167,36 @@ void CommonSubprocessInit(const std::string& process_type) { #endif } -void InitializeStatsTable(base::ProcessId browser_pid, - const CommandLine& command_line) { +static base::ProcessId GetBrowserPid(const CommandLine& command_line) { + base::ProcessId browser_pid = base::GetCurrentProcId(); + if (command_line.HasSwitch(switches::kProcessChannelID)) { +#if defined(OS_WIN) || defined(OS_MACOSX) + std::string channel_name = + command_line.GetSwitchValueASCII(switches::kProcessChannelID); + + int browser_pid_int; + base::StringToInt(channel_name, &browser_pid_int); + browser_pid = static_cast<base::ProcessId>(browser_pid_int); + DCHECK_NE(browser_pid_int, 0); +#elif defined(OS_ANDROID) + // On Android, the browser process isn't the parent. A bunch + // of work will be required before callers of this routine will + // get what they want. + // + // Note: On Linux, base::GetParentProcessId() is defined in + // process_util_linux.cc. Note that *_linux.cc is excluded from + // Android builds but a special exception is made in base.gypi + // for a few files including process_util_linux.cc. + LOG(ERROR) << "GetBrowserPid() not implemented for Android()."; +#elif defined(OS_POSIX) + // On linux, we're in the zygote here; so we need the parent process' id. + browser_pid = base::GetParentProcessId(base::GetCurrentProcId()); +#endif + } + return browser_pid; +} + +static void InitializeStatsTable(const CommandLine& command_line) { // Initialize the Stats Counters table. With this initialized, // the StatsViewer can be utilized to read counters outside of // Chrome. These lines can be commented out to effectively turn @@ -178,9 +206,9 @@ void InitializeStatsTable(base::ProcessId browser_pid, // NOTIMPLEMENTED: we probably need to shut this down correctly to avoid // leaking shared memory regions on posix platforms. std::string statsfile = - base::StringPrintf("%s-%u", - content::kStatsFilename, - static_cast<unsigned int>(browser_pid)); + base::StringPrintf( + "%s-%u", content::kStatsFilename, + static_cast<unsigned int>(GetBrowserPid(command_line))); base::StatsTable* stats_table = new base::StatsTable(statsfile, content::kStatsMaxThreads, content::kStatsMaxCounters); base::StatsTable::set_current(stats_table); @@ -240,9 +268,7 @@ int RunZygote(const content::MainFunctionParams& main_function_params, // The StatsTable must be initialized in each process; we already // initialized for the browser process, now we need to initialize // within the new processes as well. - pid_t browser_pid = base::GetParentProcessId( - base::GetParentProcessId(base::GetCurrentProcId())); - InitializeStatsTable(browser_pid, command_line); + InitializeStatsTable(command_line); content::MainFunctionParams main_params(command_line); @@ -492,23 +518,7 @@ static void ReleaseFreeMemoryThunk() { CHECK(icu_util::Initialize()); - base::ProcessId browser_pid = base::GetCurrentProcId(); - if (command_line.HasSwitch(switches::kProcessChannelID)) { -#if defined(OS_WIN) || defined(OS_MACOSX) - std::string channel_name = - command_line.GetSwitchValueASCII(switches::kProcessChannelID); - - int browser_pid_int; - base::StringToInt(channel_name, &browser_pid_int); - browser_pid = static_cast<base::ProcessId>(browser_pid_int); - DCHECK_NE(browser_pid_int, 0); -#elif defined(OS_POSIX) - // On linux, we're in the zygote here; so we need the parent process' id. - browser_pid = base::GetParentProcessId(base::GetCurrentProcId()); -#endif - } - - InitializeStatsTable(browser_pid, command_line); + InitializeStatsTable(command_line); if (delegate) delegate->PreSandboxStartup(); |