Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4)

Side by Side Diff: content/browser/zygote_host/zygote_communication_linux.cc

Issue 2851653002: Make sanitizer signal handlers work again. (Closed)
Patch Set: Move commandline init to before SetupSignalHandlers(). Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/browser/zygote_host/zygote_communication_linux.h" 5 #include "content/browser/zygote_host/zygote_communication_linux.h"
6 6
7 #include <string.h> 7 #include <string.h>
8 #include <sys/socket.h> 8 #include <sys/socket.h>
9 9
10 #include "base/base_switches.h" 10 #include "base/base_switches.h"
11 #include "base/command_line.h" 11 #include "base/command_line.h"
12 #include "base/logging.h" 12 #include "base/logging.h"
13 #include "base/metrics/histogram_macros.h" 13 #include "base/metrics/histogram_macros.h"
14 #include "base/metrics/sparse_histogram.h" 14 #include "base/metrics/sparse_histogram.h"
15 #include "base/path_service.h" 15 #include "base/path_service.h"
16 #include "base/pickle.h" 16 #include "base/pickle.h"
17 #include "base/posix/eintr_wrapper.h" 17 #include "base/posix/eintr_wrapper.h"
18 #include "base/posix/unix_domain_socket_linux.h" 18 #include "base/posix/unix_domain_socket_linux.h"
19 #include "content/browser/zygote_host/zygote_host_impl_linux.h" 19 #include "content/browser/zygote_host/zygote_host_impl_linux.h"
20 #include "content/common/zygote_commands_linux.h" 20 #include "content/common/zygote_commands_linux.h"
21 #include "content/public/browser/content_browser_client.h" 21 #include "content/public/browser/content_browser_client.h"
22 #include "content/public/common/content_client.h" 22 #include "content/public/common/content_client.h"
23 #include "content/public/common/content_switches.h" 23 #include "content/public/common/content_switches.h"
24 #include "content/public/common/result_codes.h" 24 #include "content/public/common/result_codes.h"
25 #include "services/service_manager/embedder/switches.h"
25 #include "ui/display/display_switches.h" 26 #include "ui/display/display_switches.h"
26 #include "ui/gfx/switches.h" 27 #include "ui/gfx/switches.h"
27 28
28 namespace content { 29 namespace content {
29 30
30 ZygoteCommunication::ZygoteCommunication() 31 ZygoteCommunication::ZygoteCommunication()
31 : control_fd_(), 32 : control_fd_(),
32 control_lock_(), 33 control_lock_(),
33 pid_(), 34 pid_(),
34 list_of_running_zygote_children_(), 35 list_of_running_zygote_children_(),
(...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after
242 const base::CommandLine& browser_command_line = 243 const base::CommandLine& browser_command_line =
243 *base::CommandLine::ForCurrentProcess(); 244 *base::CommandLine::ForCurrentProcess();
244 if (browser_command_line.HasSwitch(switches::kZygoteCmdPrefix)) { 245 if (browser_command_line.HasSwitch(switches::kZygoteCmdPrefix)) {
245 cmd_line.PrependWrapper( 246 cmd_line.PrependWrapper(
246 browser_command_line.GetSwitchValueNative(switches::kZygoteCmdPrefix)); 247 browser_command_line.GetSwitchValueNative(switches::kZygoteCmdPrefix));
247 } 248 }
248 // Append any switches from the browser process that need to be forwarded on 249 // Append any switches from the browser process that need to be forwarded on
249 // to the zygote/renderers. 250 // to the zygote/renderers.
250 // Should this list be obtained from browser_render_process_host.cc? 251 // Should this list be obtained from browser_render_process_host.cc?
251 static const char* const kForwardSwitches[] = { 252 static const char* const kForwardSwitches[] = {
253 service_manager::switches::kDisableInProcessStackTraces,
252 switches::kAllowSandboxDebugging, switches::kAndroidFontsPath, 254 switches::kAllowSandboxDebugging, switches::kAndroidFontsPath,
253 switches::kDisableSeccompFilterSandbox, switches::kEnableHeapProfiling, 255 switches::kDisableSeccompFilterSandbox, switches::kEnableHeapProfiling,
254 switches::kEnableLogging, // Support, e.g., --enable-logging=stderr. 256 switches::kEnableLogging, // Support, e.g., --enable-logging=stderr.
255 // Need to tell the zygote that it is headless so that we don't try to use 257 // Need to tell the zygote that it is headless so that we don't try to use
256 // the wrong type of main delegate. 258 // the wrong type of main delegate.
257 switches::kHeadless, 259 switches::kHeadless,
258 // Zygote process needs to know what resources to have loaded when it 260 // Zygote process needs to know what resources to have loaded when it
259 // becomes a renderer process. 261 // becomes a renderer process.
260 switches::kForceDeviceScaleFactor, switches::kLoggingLevel, 262 switches::kForceDeviceScaleFactor, switches::kLoggingLevel,
261 switches::kNoSandbox, switches::kPpapiInProcess, 263 switches::kNoSandbox, switches::kPpapiInProcess,
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
331 } 333 }
332 if (ReadSandboxStatus() == -1) { 334 if (ReadSandboxStatus() == -1) {
333 return 0; 335 return 0;
334 } 336 }
335 have_read_sandbox_status_word_ = true; 337 have_read_sandbox_status_word_ = true;
336 UMA_HISTOGRAM_SPARSE_SLOWLY("Linux.SandboxStatus", sandbox_status_); 338 UMA_HISTOGRAM_SPARSE_SLOWLY("Linux.SandboxStatus", sandbox_status_);
337 return sandbox_status_; 339 return sandbox_status_;
338 } 340 }
339 341
340 } // namespace content 342 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/renderer_host/render_process_host_impl.cc ('k') | content/public/common/content_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698