corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1157323 - Part 3: Do not allow mTimeout to change while a timer is in the queue. r=froydnj

Browse Source 
MozReview-Commit-ID: 3ZyikUsix8D
This commit is contained in:
Byron Campen [:bwc]
2016-08-05 10:07:38 -05:00
parent 624a10a269
commit c2bcb35570
3 changed files with 8 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
xpcom/threads/TimerThread.cpp
View File

@@ -582,40 +582,13 @@ TimerThread::AddTimer(nsTimerImpl* aTimer)
return NS_OK;
}
nsresult
TimerThread::TimerDelayChanged(nsTimerImpl* aTimer)
{
MonitorAutoLock lock(mMonitor);
// Our caller has a strong ref to aTimer, so it can't go away here under
// ReleaseTimerInternal.
RemoveTimerInternal(aTimer);
int32_t i = AddTimerInternal(aTimer);
if (i < 0) {
return NS_ERROR_OUT_OF_MEMORY;
}
// Awaken the timer thread.
if (mWaiting && i == 0) {
mNotified = true;
mMonitor.Notify();
}
return NS_OK;
}
nsresult
TimerThread::RemoveTimer(nsTimerImpl* aTimer)
{
MonitorAutoLock lock(mMonitor);
// Remove the timer from our array. Tell callers that aTimer was not found
// by returning NS_ERROR_NOT_AVAILABLE. Unlike the TimerDelayChanged case
// immediately above, our caller may be passing a (now-)weak ref in via the
// aTimer param, specifically when nsTimerImpl::Release loses a race with
// TimerThread::Run, must wait for the mMonitor auto-lock here, and during the
// wait Run drops the only remaining ref to aTimer via RemoveTimerInternal.
// by returning NS_ERROR_NOT_AVAILABLE.
if (!RemoveTimerInternal(aTimer)) {
return NS_ERROR_NOT_AVAILABLE;