Backed out 3 changesets (bug 1470151) for build bustage at testing/xpcshell/selftest.py on a CLOSED TREE
Backed out changeset c73f394a4bef (bug 1470151) Backed out changeset 3579431e03dc (bug 1470151) Backed out changeset ddde7dd347d4 (bug 1470151)
This commit is contained in:
@@ -44,7 +44,7 @@ void counters_reset() {
|
||||
|
||||
StaticAutoPtr<CodeCoverageHandler> CodeCoverageHandler::instance;
|
||||
|
||||
void CodeCoverageHandler::DumpCounters()
|
||||
void CodeCoverageHandler::DumpCounters(int)
|
||||
{
|
||||
CrossProcessMutexAutoLock lock(*CodeCoverageHandler::Get()->GetMutex());
|
||||
|
||||
@@ -53,12 +53,7 @@ void CodeCoverageHandler::DumpCounters()
|
||||
printf_stderr("[CodeCoverage] Dump completed.\n");
|
||||
}
|
||||
|
||||
void CodeCoverageHandler::DumpCountersSignalHandler(int)
|
||||
{
|
||||
DumpCounters();
|
||||
}
|
||||
|
||||
void CodeCoverageHandler::ResetCounters()
|
||||
void CodeCoverageHandler::ResetCounters(int)
|
||||
{
|
||||
CrossProcessMutexAutoLock lock(*CodeCoverageHandler::Get()->GetMutex());
|
||||
|
||||
@@ -67,25 +62,20 @@ void CodeCoverageHandler::ResetCounters()
|
||||
printf_stderr("[CodeCoverage] Reset completed.\n");
|
||||
}
|
||||
|
||||
void CodeCoverageHandler::ResetCountersSignalHandler(int)
|
||||
{
|
||||
ResetCounters();
|
||||
}
|
||||
|
||||
void CodeCoverageHandler::SetSignalHandlers()
|
||||
{
|
||||
#ifndef XP_WIN
|
||||
printf_stderr("[CodeCoverage] Setting handlers for process %d.\n", getpid());
|
||||
|
||||
struct sigaction dump_sa;
|
||||
dump_sa.sa_handler = CodeCoverageHandler::DumpCountersSignalHandler;
|
||||
dump_sa.sa_handler = CodeCoverageHandler::DumpCounters;
|
||||
dump_sa.sa_flags = SA_RESTART;
|
||||
sigemptyset(&dump_sa.sa_mask);
|
||||
DebugOnly<int> r1 = sigaction(SIGUSR1, &dump_sa, nullptr);
|
||||
MOZ_ASSERT(r1 == 0, "Failed to install GCOV SIGUSR1 handler");
|
||||
|
||||
struct sigaction reset_sa;
|
||||
reset_sa.sa_handler = CodeCoverageHandler::ResetCountersSignalHandler;
|
||||
reset_sa.sa_handler = CodeCoverageHandler::ResetCounters;
|
||||
reset_sa.sa_flags = SA_RESTART;
|
||||
sigemptyset(&reset_sa.sa_mask);
|
||||
DebugOnly<int> r2 = sigaction(SIGUSR2, &reset_sa, nullptr);
|
||||
|
||||
Reference in New Issue
Block a user