mirror of
https://github.com/chromium/crashpad.git
synced 2024-12-29 00:32:35 +08:00
90054edf62
hanging_program.exe is used by crash_other_program.exe, which is in turn used by end_to_end_test.py. It hangs by loading loader_lock_dll.dll, which squats in its entry point function while the loader lock is held. hanging_program.exe needs to do some work in its Thread1() before the loader lock is taken (a SetThreadPriority() call), and needs to do some work in its main thread once the loader lock is held (it needs to signal crash_other_program.exe that it’s successfully wedged itself). Previously, proper synchronization was not provided. A 1-second Sleep() was used to wait for the loader lock to be taken. Thread1() pre-work was only achieved before the loader lock was taken by sheer luck. Things didn’t always work out so nicely. This uses an event handle to provide synchronization. An environment variable is used to pass the handle to loader_lock_dll.dll, because there aren’t many better options available. This eliminates both flake and the unnecessary 1-second delay in hanging_program.exe, and since this program runs twice during end_to_end_test.py, it improves that test’s runtime by 2 seconds. Bug: crashpad:197 Test: end_to_end_test.py Change-Id: Ib9883215ef96bed7571464cc68e09b6ab6310ae6 Reviewed-on: https://chromium-review.googlesource.com/700076 Commit-Queue: Mark Mentovai <mark@chromium.org> Reviewed-by: Leonard Mosescu <mosescu@chromium.org> Reviewed-by: Scott Graham <scottmg@chromium.org>
75 lines
2.0 KiB
C++
75 lines
2.0 KiB
C++
// Copyright 2015 The Crashpad Authors. All rights reserved.
|
||
//
|
||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||
// you may not use this file except in compliance with the License.
|
||
// You may obtain a copy of the License at
|
||
//
|
||
// http://www.apache.org/licenses/LICENSE-2.0
|
||
//
|
||
// Unless required by applicable law or agreed to in writing, software
|
||
// distributed under the License is distributed on an "AS IS" BASIS,
|
||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||
// See the License for the specific language governing permissions and
|
||
// limitations under the License.
|
||
|
||
#include "util/win/ntstatus_logging.h"
|
||
|
||
#include <string>
|
||
|
||
#include "base/strings/stringprintf.h"
|
||
|
||
namespace {
|
||
|
||
std::string FormatNtstatus(DWORD ntstatus) {
|
||
char msgbuf[256];
|
||
DWORD len = FormatMessageA(
|
||
FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS |
|
||
FORMAT_MESSAGE_MAX_WIDTH_MASK | FORMAT_MESSAGE_FROM_HMODULE,
|
||
GetModuleHandle(L"ntdll.dll"),
|
||
ntstatus,
|
||
0,
|
||
msgbuf,
|
||
arraysize(msgbuf),
|
||
nullptr);
|
||
if (len) {
|
||
// Most system messages end in a period and a space. Remove the space if
|
||
// it’s there, because ~NtstatusLogMessage() includes one.
|
||
if (len >= 1 && msgbuf[len - 1] == ' ') {
|
||
msgbuf[len - 1] = '\0';
|
||
}
|
||
return msgbuf;
|
||
} else {
|
||
return base::StringPrintf("<failed to retrieve error message (0x%lx)>",
|
||
GetLastError());
|
||
}
|
||
}
|
||
|
||
} // namespace
|
||
|
||
namespace logging {
|
||
|
||
NtstatusLogMessage::NtstatusLogMessage(
|
||
#if defined(MINI_CHROMIUM_BASE_LOGGING_H_)
|
||
const char* function,
|
||
#endif
|
||
const char* file_path,
|
||
int line,
|
||
LogSeverity severity,
|
||
DWORD ntstatus)
|
||
: LogMessage(
|
||
#if defined(MINI_CHROMIUM_BASE_LOGGING_H_)
|
||
function,
|
||
#endif
|
||
file_path,
|
||
line,
|
||
severity),
|
||
ntstatus_(ntstatus) {
|
||
}
|
||
|
||
NtstatusLogMessage::~NtstatusLogMessage() {
|
||
stream() << ": " << FormatNtstatus(ntstatus_)
|
||
<< base::StringPrintf(" (0x%08lx)", ntstatus_);
|
||
}
|
||
|
||
} // namespace logging
|