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

Unified Diff: headless/lib/browser/headless_content_browser_client.cc

Issue 2693943004: headless: Add support for minidump generation on Linux (Closed)
Patch Set: Formatting Created 3 years, 10 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 side-by-side diff with in-line comments
Download patch
Index: headless/lib/browser/headless_content_browser_client.cc
diff --git a/headless/lib/browser/headless_content_browser_client.cc b/headless/lib/browser/headless_content_browser_client.cc
index 101d15c662f0386a2cd05b37a7ebdae88f5f885c..b58b09bad1fb7beaa6a953bf2983b3fff4f452ab 100644
--- a/headless/lib/browser/headless_content_browser_client.cc
+++ b/headless/lib/browser/headless_content_browser_client.cc
@@ -7,14 +7,18 @@
#include <memory>
#include <unordered_set>
+#include "base/base_switches.h"
#include "base/callback.h"
+#include "base/command_line.h"
#include "base/json/json_reader.h"
#include "base/memory/ptr_util.h"
+#include "base/path_service.h"
#include "content/public/browser/browser_context.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/render_process_host.h"
#include "content/public/browser/render_view_host.h"
#include "content/public/browser/storage_partition.h"
+#include "content/public/common/content_switches.h"
#include "content/public/common/service_names.mojom.h"
#include "headless/grit/headless_lib_resources.h"
#include "headless/lib/browser/headless_browser_context_impl.h"
@@ -24,11 +28,77 @@
#include "storage/browser/quota/quota_settings.h"
#include "ui/base/resource/resource_bundle.h"
+#if defined(OS_POSIX) && !defined(OS_MACOSX)
+#include "base/debug/leak_annotations.h"
+#include "components/crash/content/app/breakpad_linux.h"
+#include "components/crash/content/browser/crash_handler_host_linux.h"
+#include "content/public/common/content_descriptors.h"
+#endif
+
namespace headless {
namespace {
const char kCapabilityPath[] =
"interface_provider_specs.navigation:frame.provides.renderer";
+
+#if defined(OS_POSIX) && !defined(OS_MACOSX)
+breakpad::CrashHandlerHostLinux* CreateCrashHandlerHost(
+ const std::string& process_type,
+ const HeadlessBrowser::Options& options) {
+ base::FilePath dumps_path = options.crash_dumps_dir;
+ if (dumps_path.empty()) {
+ bool ok = PathService::Get(base::DIR_MODULE, &dumps_path);
+ DCHECK(ok);
+ }
+
+ {
+ ANNOTATE_SCOPED_MEMORY_LEAK;
+#if defined(OFFICIAL_BUILD)
+ // Upload crash dumps in official builds, unless we're running in unattended
+ // mode (not to be confused with headless mode in general -- see
+ // chrome/common/env_vars.cc).
+ static const char kHeadless[] = "CHROME_HEADLESS";
+ bool upload = (getenv(kHeadless) == nullptr);
+#else
+ bool upload = false;
+#endif
+ breakpad::CrashHandlerHostLinux* crash_handler =
+ new breakpad::CrashHandlerHostLinux(process_type, dumps_path, upload);
+ crash_handler->StartUploaderThread();
+ return crash_handler;
+ }
+}
+
+int GetCrashSignalFD(const base::CommandLine& command_line,
+ const HeadlessBrowser::Options& options) {
+ if (!breakpad::IsCrashReporterEnabled())
+ return -1;
+
+ std::string process_type =
+ command_line.GetSwitchValueASCII(switches::kProcessType);
+
+ if (process_type == switches::kRendererProcess) {
+ static breakpad::CrashHandlerHostLinux* crash_handler =
+ CreateCrashHandlerHost(process_type, options);
+ return crash_handler->GetDeathSignalSocket();
+ }
+
+ if (process_type == switches::kPpapiPluginProcess) {
+ static breakpad::CrashHandlerHostLinux* crash_handler =
+ CreateCrashHandlerHost(process_type, options);
+ return crash_handler->GetDeathSignalSocket();
+ }
+
+ if (process_type == switches::kGpuProcess) {
+ static breakpad::CrashHandlerHostLinux* crash_handler =
+ CreateCrashHandlerHost(process_type, options);
+ return crash_handler->GetDeathSignalSocket();
+ }
+
+ return -1;
+}
+#endif // defined(OS_POSIX) && !defined(OS_MACOSX)
+
} // namespace
HeadlessContentBrowserClient::HeadlessContentBrowserClient(
@@ -99,4 +169,25 @@ void HeadlessContentBrowserClient::GetQuotaSettings(
callback);
}
+void HeadlessContentBrowserClient::GetAdditionalMappedFilesForChildProcess(
+ const base::CommandLine& command_line,
+ int child_process_id,
+ content::FileDescriptorInfo* mappings) {
+#if defined(OS_POSIX) && !defined(OS_MACOSX)
alex clarke (OOO till 29th) 2017/02/14 15:14:08 Does the crash pad code typically use this pre-pro
Sami 2017/02/14 18:36:46 Good point, I copied this pattern from content/ an
+ int crash_signal_fd = GetCrashSignalFD(command_line, *browser_->options());
+ if (crash_signal_fd >= 0)
+ mappings->Share(kCrashDumpSignal, crash_signal_fd);
+#endif // defined(OS_POSIX) && !defined(OS_MACOSX)
+}
+
+void HeadlessContentBrowserClient::AppendExtraCommandLineSwitches(
+ base::CommandLine* command_line,
+ int child_process_id) {
+#if defined(OS_POSIX) && !defined(OS_MACOSX)
+ // This flag tells child processes to also turn on crash reporting.
+ if (breakpad::IsCrashReporterEnabled())
+ command_line->AppendSwitch(switches::kEnableCrashReporter);
+#endif // defined(OS_POSIX) && !defined(OS_MACOSX)
+}
+
} // namespace headless

Powered by Google App Engine
This is Rietveld 408576698