зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1232285 - The Terminator's notion of ticks is incorrect. r=Yoric
This commit is contained in:
Родитель
ce03c4c5bc
Коммит
c9c5bdabda
|
@ -53,9 +53,6 @@
|
|||
// forcefully.
|
||||
#define ADDITIONAL_WAIT_BEFORE_CRASH_MS 3000
|
||||
|
||||
// One second, in ticks.
|
||||
#define TICK_DURATION 1000
|
||||
|
||||
namespace mozilla {
|
||||
|
||||
namespace {
|
||||
|
@ -130,6 +127,7 @@ RunWatchdog(void* arg)
|
|||
options = nullptr;
|
||||
|
||||
const uint32_t timeToLive = crashAfterTicks;
|
||||
const PRIntervalTime ticksDuration = PR_MillisecondsToInterval(1000);
|
||||
while (true) {
|
||||
//
|
||||
// We do not want to sleep for the entire duration,
|
||||
|
@ -141,7 +139,7 @@ RunWatchdog(void* arg)
|
|||
// we have lost at most one second, which is much
|
||||
// more reasonable.
|
||||
//
|
||||
PR_Sleep(TICK_DURATION);
|
||||
PR_Sleep(ticksDuration);
|
||||
|
||||
if (gHeartbeat++ < timeToLive) {
|
||||
continue;
|
||||
|
@ -378,7 +376,8 @@ nsTerminator::StartWatchdog()
|
|||
}
|
||||
|
||||
UniquePtr<Options> options(new Options());
|
||||
options->crashAfterTicks = crashAfterMS / TICK_DURATION;
|
||||
const PRIntervalTime ticksDuration = PR_MillisecondsToInterval(1000);
|
||||
options->crashAfterTicks = crashAfterMS / ticksDuration;
|
||||
|
||||
DebugOnly<PRThread*> watchdogThread = CreateSystemThread(RunWatchdog,
|
||||
options.release());
|
||||
|
|
Загрузка…
Ссылка в новой задаче