wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-09-03 06:18:38 +09:00
Code Issues Projects Releases Packages Wiki Activity

[xpcom] Timer cleanup, assertions and comments.

Browse source
This commit is contained in:
Moonchild 2022-03-08 22:32:28 +00:00 • committed by roytam1
commit bd80099e2c
4 changed files with 24 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

20
xpcom/threads/TimerThread.cpp
View file

@ -623,10 +623,13 @@ TimerThread::AddTimerInternal(nsTimerImpl* aTimer)
return insertSlot - mTimers.Elements();
}
// This function must be called from within a lock.
// Also: we hold the mutex for the nsTimerImpl.
bool
TimerThread::RemoveTimerInternal(nsTimerImpl* aTimer)
{
mMonitor.AssertCurrentThreadOwns();
aTimer->mMutex.AssertCurrentThreadOwns();
if (!mTimers.RemoveElement(aTimer)) {
return false;
}
@ -690,12 +693,17 @@ TimerThread::PostTimerEvent(already_AddRefed<nsTimerImpl> aTimerRef)
// at the TimerThread we'll deadlock.
MonitorAutoUnlock unlock(mMonitor);
rv = target->Dispatch(event, NS_DISPATCH_NORMAL);
}
if (NS_FAILED(rv)) {
timer = event->ForgetTimer();
RemoveTimerInternal(timer);
return timer.forget();
if (NS_FAILED(rv)) {
timer = event->ForgetTimer();
// We do this to avoid possible deadlock by taking the two locks in a
// different order than is used in RemoveTimer(). RemoveTimer() has
// aTimer->mMutex first. We use timer.get() to keep static analysis
// happy.
MutexAutoLock lock1(timer.get()->mMutex);
MonitorAutoLock lock2(mMonitor);
RemoveTimerInternal(timer.get());
return timer.forget();
}
}
return nullptr;