diff options
| author | Nathan Froyd <froydnj@mozilla.com> | 2019-09-04 17:55:04 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-09-04 17:55:04 +0200 |
| commit | 4266966eeef44dfce422b9703692e519678610c6 (patch) | |
| tree | 4dba75458909612679e7c28837a12e5712bbbcac /xpcom | |
| parent | c6446f1126232935c85397aac493113dd38496cd (diff) | |
| download | UXP-4266966eeef44dfce422b9703692e519678610c6.tar UXP-4266966eeef44dfce422b9703692e519678610c6.tar.gz UXP-4266966eeef44dfce422b9703692e519678610c6.tar.lz UXP-4266966eeef44dfce422b9703692e519678610c6.tar.xz UXP-4266966eeef44dfce422b9703692e519678610c6.zip | |
Kill newly-spawned threads if we're shutting down.
Diffstat (limited to 'xpcom')
| -rw-r--r-- | xpcom/threads/nsThreadPool.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/xpcom/threads/nsThreadPool.cpp b/xpcom/threads/nsThreadPool.cpp index 241fad39d..eb967870a 100644 --- a/xpcom/threads/nsThreadPool.cpp +++ b/xpcom/threads/nsThreadPool.cpp @@ -112,7 +112,9 @@ nsThreadPool::PutEvent(already_AddRefed<nsIRunnable> aEvent, uint32_t aFlags) bool killThread = false; { MutexAutoLock lock(mMutex); - if (mThreads.Count() < (int32_t)mThreadLimit) { + if (mShutdown) { + killThread = true; // we're in shutdown, kill the thread + } else if (mThreads.Count() < (int32_t)mThreadLimit) { mThreads.AppendObject(thread); } else { killThread = true; // okay, we don't need this thread anymore |