wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 900711 - '~nsIThreadPool can run the event loop if shutdown has not been called'. r=ehsan.

Browse Source
This commit is contained in:
Ben Turner 2013-08-02 13:19:36 -07:00
parent 4d3f2e3a55
commit 7babe734dc
1 changed files with 54 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
xpcom/threads/nsThreadPool.cpp
View File

@ -37,6 +37,24 @@ GetThreadPoolLog()
#define DEFAULT_IDLE_THREAD_LIMIT 1
#define DEFAULT_IDLE_THREAD_TIMEOUT PR_SecondsToInterval(60)
class ShutdownHelper MOZ_FINAL : public nsRunnable
{
public:
NS_DECL_NSIRUNNABLE
ShutdownHelper(nsCOMArray<nsIThread>& aThreads,
already_AddRefed<nsIThreadPoolListener>& aListener)
: mListener(aListener)
{
MOZ_ASSERT(!aThreads.IsEmpty());
mThreads.SwapElements(aThreads);
}
private:
nsCOMArray<nsIThread> mThreads;
nsCOMPtr<nsIThreadPoolListener> mListener;
};
NS_IMPL_ADDREF(nsThreadPool)
NS_IMPL_RELEASE(nsThreadPool)
NS_IMPL_CLASSINFO(nsThreadPool, NULL, nsIClassInfo::THREADSAFE,
@ -56,7 +74,28 @@ nsThreadPool::nsThreadPool()
nsThreadPool::~nsThreadPool()
{
Shutdown();
// Calling Shutdown() directly is not safe since it will spin the event loop
// (perhaps during a GC). Instead we try to delay-shutdown each thread that is
// still alive.
nsCOMArray<nsIThread> threads;
nsCOMPtr<nsIThreadPoolListener> listener;
{
ReentrantMonitorAutoEnter mon(mEvents.GetReentrantMonitor());
if (!mShutdown) {
NS_WARNING("nsThreadPool destroyed before Shutdown() was called!");
mThreads.SwapElements(threads);
mListener.swap(listener);
}
}
if (!threads.IsEmpty()) {
nsRefPtr<ShutdownHelper> helper =
new ShutdownHelper(threads, listener.forget());
if (NS_FAILED(NS_DispatchToMainThread(helper, NS_DISPATCH_NORMAL))) {
NS_WARNING("Unable to shut down threads in this thread pool!");
}
}
}
nsresult
@ -374,3 +413,17 @@ nsThreadPool::SetName(const nsACString& aName)
mName = aName;
return NS_OK;
}
NS_IMETHODIMP
ShutdownHelper::Run()
{
MOZ_ASSERT(!mThreads.IsEmpty());
for (int32_t i = 0; i < mThreads.Count(); ++i)
mThreads[i]->Shutdown();
mThreads.Clear();
mListener = nullptr;
return NS_OK;
}