| Index: chrome/browser/process_singleton_win.cc
|
| diff --git a/chrome/browser/process_singleton_win.cc b/chrome/browser/process_singleton_win.cc
|
| index 335215680f0d1063b90260fcd4b1e7b9e39a3248..458cac6a262fa504eadfb82c7ef1468ded1cedcb 100644
|
| --- a/chrome/browser/process_singleton_win.cc
|
| +++ b/chrome/browser/process_singleton_win.cc
|
| @@ -4,6 +4,7 @@
|
|
|
| #include "chrome/browser/process_singleton.h"
|
|
|
| +#include <windows.h>
|
| #include <shellapi.h>
|
| #include <stddef.h>
|
|
|
| @@ -12,6 +13,7 @@
|
| #include "base/command_line.h"
|
| #include "base/files/file_path.h"
|
| #include "base/macros.h"
|
| +#include "base/path_service.h"
|
| #include "base/process/process.h"
|
| #include "base/process/process_info.h"
|
| #include "base/strings/string_number_conversions.h"
|
| @@ -26,14 +28,20 @@
|
| #include "chrome/browser/chrome_process_finder_win.h"
|
| #include "chrome/browser/shell_integration.h"
|
| #include "chrome/browser/ui/simple_message_box.h"
|
| +#include "chrome/chrome_watcher/kasko_util.h"
|
| +#include "chrome/common/channel_info.h"
|
| #include "chrome/common/chrome_constants.h"
|
| #include "chrome/common/chrome_paths.h"
|
| #include "chrome/common/chrome_paths_internal.h"
|
| #include "chrome/common/chrome_switches.h"
|
| #include "chrome/grit/chromium_strings.h"
|
| +#include "chrome/installer/util/google_update_settings.h"
|
| +#include "chrome/installer/util/util_constants.h"
|
| #include "chrome/installer/util/wmi.h"
|
| +#include "components/version_info/version_info.h"
|
| #include "content/public/common/result_codes.h"
|
| #include "net/base/escape.h"
|
| +#include "third_party/kasko/kasko_features.h"
|
| #include "ui/base/l10n/l10n_util.h"
|
| #include "ui/gfx/win/hwnd_util.h"
|
|
|
| @@ -179,6 +187,48 @@ bool DisplayShouldKillMessageBox() {
|
| chrome::MESSAGE_BOX_RESULT_NO;
|
| }
|
|
|
| +#if BUILDFLAG(ENABLE_KASKO)
|
| +#if BUILDFLAG(ENABLE_KASKO_FAILED_RDV_REPORTS)
|
| +// Capture a failed rendez-vous hang report of the other process. Kasko needs
|
| +// the exception context to live either in the dumper or the dumpee. This
|
| +// means we cannot rely on kasko reporters from either browser watcher, and
|
| +// instead spin up a new reporter.
|
| +void SendFailedRdvReport(const base::Process& process, DWORD thread_id) {
|
| + // TODO(manzagop): add a metric for the number of captured hang reports, for
|
| + // comparison with uploaded count?
|
| +
|
| + // Only report on canary (or unspecified).
|
| + const version_info::Channel channel = chrome::GetChannel();
|
| + if (channel != version_info::Channel::UNKNOWN &&
|
| + channel != version_info::Channel::CANARY) {
|
| + return;
|
| + }
|
| + // TODO(manzagop): add a metric for the number of times this does not match.
|
| + if (!EnsureTargetProcessValidForCapture(process))
|
| + return;
|
| +
|
| + // Initialize a reporter, capture a report and shutdown the reporter.
|
| + base::FilePath watcher_data_directory;
|
| + if (PathService::Get(chrome::DIR_WATCHER_DATA, &watcher_data_directory)) {
|
| + base::string16 endpoint =
|
| + L"chrome_kasko_rdv_" +
|
| + base::UintToString16(base::Process::Current().Pid());
|
| +
|
| + bool launched_kasko = InitializeKaskoReporter(
|
| + endpoint, watcher_data_directory.value().c_str());
|
| + if (launched_kasko) {
|
| + DumpHungProcess(thread_id, installer::kChromeChannelCanary, L"failed-rdv",
|
| + process);
|
| + // We immediately request Kasko shutdown. This may block until the
|
| + // completion of ongoing background tasks (e.g., upload). If the report is
|
| + // not uploaded by this reporter, any other Kasko reporter may upload it.
|
| + ShutdownKaskoReporter();
|
| + }
|
| + }
|
| +}
|
| +#endif // BUILDFLAG(ENABLE_KASKO_FAILED_RDV_REPORTS)
|
| +#endif // BUILDFLAG(ENABLE_KASKO)
|
| +
|
| } // namespace
|
|
|
| // Microsoft's Softricity virtualization breaks the sandbox processes.
|
| @@ -249,15 +299,32 @@ ProcessSingleton::NotifyResult ProcessSingleton::NotifyOtherProcess() {
|
| break;
|
| }
|
|
|
| + // The window is hung.
|
| DWORD process_id = 0;
|
| DWORD thread_id = ::GetWindowThreadProcessId(remote_window_, &process_id);
|
| if (!thread_id || !process_id) {
|
| remote_window_ = NULL;
|
| return PROCESS_NONE;
|
| }
|
| +
|
| + // Get a handle to the process that created the window.
|
| base::Process process = base::Process::Open(process_id);
|
|
|
| - // The window is hung. Scan for every window to find a visible one.
|
| + // Optionally send a failed rendez-vous report.
|
| + // Note: we nominate the thread that created the window as the root of the
|
| + // search for a hung thread.
|
| +#if defined(GOOGLE_CHROME_BUILD)
|
| + const bool stats_collection_consent =
|
| + GoogleUpdateSettings::GetCollectStatsConsent();
|
| +#if BUILDFLAG(ENABLE_KASKO)
|
| +#if BUILDFLAG(ENABLE_KASKO_FAILED_RDV_REPORTS)
|
| + if (stats_collection_consent)
|
| + SendFailedRdvReport(process, thread_id);
|
| +#endif // BUILDFLAG(ENABLE_KASKO_FAILED_RDV_REPORTS)
|
| +#endif // BUILDFLAG(ENABLE_KASKO)
|
| +#endif // GOOGLE_CHROME_BUILD
|
| +
|
| + // Scan for every window to find a visible one.
|
| bool visible_window = false;
|
| ::EnumThreadWindows(thread_id,
|
| &BrowserWindowEnumeration,
|
|
|