Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-29 07:42:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset 2872d7dca33b (bug 1284511) r=blassey a=merge

Browse Source 
--HG--
extra : source : 4248b124b502f12f1a31179aa2703da95161091e
This commit is contained in:
Tooru Fujisawa 2016-09-09 00:45:40 +09:00
parent b916384275
commit 9356fc4a5a
1 changed files with 19 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
js/xpconnect/src/XPCJSRuntime.cpp
View File

@ -975,8 +975,7 @@ class Watchdog
, mHibernating(false)
, mInitialized(false)
, mShuttingDown(false)
, mSlowScriptSecondHalf(false)
, mSlowScriptHalfLastElapsedTime(0)
, mSlowScriptSecondHalfCount(0)
, mMinScriptRunTimeSeconds(1)
{}
~Watchdog() { MOZ_ASSERT(!Initialized()); }
@ -1086,27 +1085,9 @@ class Watchdog
return mMinScriptRunTimeSeconds;
}
bool IsSlowScriptSecondHalf()
{
return mSlowScriptSecondHalf;
}
void FlipSlowScriptSecondHalf()
{
mSlowScriptSecondHalf = !mSlowScriptSecondHalf;
}
PRTime GetSlowScriptHalfLastElapsedTime()
{
return mSlowScriptHalfLastElapsedTime;
}
void SetSlowScriptHalfLastElapsedTime(PRTime t)
{
mSlowScriptHalfLastElapsedTime = t;
}
void ResetSlowScript()
{
mSlowScriptSecondHalf = false;
mSlowScriptHalfLastElapsedTime = 0;
}
uint32_t GetSlowScriptSecondHalfCount() { return mSlowScriptSecondHalfCount; }
void IncrementSlowScriptSecondHalfCount() { mSlowScriptSecondHalfCount++; }
void ResetSlowScriptSecondHalfCount() { mSlowScriptSecondHalfCount = 0; }
private:
WatchdogManager* mManager;
@ -1119,8 +1100,7 @@ class Watchdog
bool mShuttingDown;
// See the comment in WatchdogMain.
bool mSlowScriptSecondHalf;
PRTime mSlowScriptHalfLastElapsedTime;
uint32_t mSlowScriptSecondHalfCount;
mozilla::Atomic<int32_t> mMinScriptRunTimeSeconds;
};
@ -1186,7 +1166,7 @@ class WatchdogManager : public nsIObserver
// Write state.
mTimestamps[TimestampRuntimeStateChange] = PR_Now();
if (mWatchdog)
mWatchdog->ResetSlowScript();
mWatchdog->ResetSlowScriptSecondHalfCount();
mRuntimeState = active ? RUNTIME_ACTIVE : RUNTIME_INACTIVE;
// The watchdog may be hibernating, waiting for the runtime to go
@ -1318,32 +1298,32 @@ WatchdogMain(void* arg)
// T/2 periods, the script still has the other T/2 seconds to finish.
//
// + <-- TimestampRuntimeStateChange = PR_Now()
// | mSlowScriptSecondHalfCount = 0
// |
// | t0 >= T/2
// | T/2
// |
// + <-- mSlowScriptSecondHalf == false
// + <-- mSlowScriptSecondHalfCount = 1
// |
// | t1 >= T/2
// | T/2
// |
// + <-- mSlowScriptSecondHalf == true
// + <-- mSlowScriptSecondHalfCount = 2
// | Invoke interrupt callback
// |
// | t2 >= T/2
// | T/2
// |
// + <-- mSlowScriptSecondHalf == false
// + <-- mSlowScriptSecondHalfCount = 3
// |
// | t3 >= T/2
// | T/2
// |
// + <-- mSlowScriptSecondHalf == true
// + <-- mSlowScriptSecondHalfCount = 4
// Invoke interrupt callback
//
PRTime usecs = self->MinScriptRunTimeSeconds() * PR_USEC_PER_SEC;
if (manager->IsRuntimeActive()) {
PRTime elapsedTime = manager->TimeSinceLastRuntimeStateChange();
PRTime lastElapsedTime = self->GetSlowScriptHalfLastElapsedTime();
if (elapsedTime >= lastElapsedTime + usecs / 2) {
self->SetSlowScriptHalfLastElapsedTime(elapsedTime);
if (self->IsSlowScriptSecondHalf()) {
uint32_t count = self->GetSlowScriptSecondHalfCount() + 1;
if (manager->TimeSinceLastRuntimeStateChange() >= usecs * count / 2) {
self->IncrementSlowScriptSecondHalfCount();
if (count % 2 == 0) {
bool debuggerAttached = false;
nsCOMPtr<nsIDebug2> dbg = do_GetService("@mozilla.org/xpcom/debug;1");
if (dbg)
@ -1351,7 +1331,6 @@ WatchdogMain(void* arg)
if (!debuggerAttached)
JS_RequestInterruptCallback(manager->Runtime()->Context());
}
self->FlipSlowScriptSecondHalf();
}
}
}