Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Mac shutdown crash, bug 116128. Ensure that the timer thread dies by using Join(). r=syd, sr=jag

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@111020 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
sfraser%netscape.com
2001-12-22 00:21:46 +00:00
parent 207cd25a19
commit 969b04ca5e
1 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
mozilla/xpcom/threads/TimerThread.cpp
View File

@@ -104,20 +104,23 @@ nsresult TimerThread::Shutdown()
if (!mThread)
return NS_ERROR_NOT_INITIALIZED;
nsAutoLock lock(mLock);
{ // lock scope
nsAutoLock lock(mLock);
mProcessing = PR_FALSE;
mProcessing = PR_FALSE;
// notify the cond var so that Run() can return
if (mCondVar && mWaiting)
PR_NotifyCondVar(mCondVar);
// notify the cond var so that Run() can return
if (mCondVar && mWaiting)
PR_NotifyCondVar(mCondVar);
nsTimerImpl *timer;
for (PRInt32 i = mTimers.Count() - 1; i >= 0; i--) {
timer = NS_STATIC_CAST(nsTimerImpl*, mTimers[i]);
RemoveTimerInternal(timer);
nsTimerImpl *timer;
for (PRInt32 i = mTimers.Count() - 1; i >= 0; i--) {
timer = NS_STATIC_CAST(nsTimerImpl*, mTimers[i]);
RemoveTimerInternal(timer);
}
}
mThread->Join(); // wait for the thread to die
return NS_OK;
}
@@ -135,10 +138,11 @@ NS_IMETHODIMP TimerThread::Run()
PRIntervalTime itIsNow = PR_IntervalNow();
#ifdef ACCEPT_WRONG_TIMES
if (itIsNow + kThreeMS > timer->mTimeout - kThreeMS) {
if (itIsNow + kThreeMS > timer->mTimeout - kThreeMS)
#else
if (itIsNow >= timer->mTimeout) {
if (itIsNow >= timer->mTimeout)
#endif
{
RemoveTimerInternal(timer);
theTimer = timer;
NS_ADDREF(theTimer);