Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-04-03 13:02:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 743786 - Add IsMainThread assertions to ClearOnShutdown. r=bmsedberg

Browse Source
This commit is contained in:
Justin Lebar 2012-04-10 15:58:10 -04:00
parent c5b2e91dc3
commit ec87e5bf0c
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
xpcom/base/ClearOnShutdown.h
View File

@ -41,6 +41,7 @@
#define mozilla_ClearOnShutdown_h #define mozilla_ClearOnShutdown_h
#include "mozilla/LinkedList.h" #include "mozilla/LinkedList.h"
#include "nsThreadUtils.h"
/* /*
* This header exports one public method in the mozilla namespace: * This header exports one public method in the mozilla namespace:
@ -56,6 +57,10 @@
* *
* There is no way to undo a call to ClearOnShutdown, so you can call it only * There is no way to undo a call to ClearOnShutdown, so you can call it only
* on smart pointers which you know will live until the program shuts down. * on smart pointers which you know will live until the program shuts down.
*
* ClearOnShutdown is currently main-thread only because we don't want to
* accidentally free an object from a different thread than the one it was
* created on.
*/ */
namespace mozilla { namespace mozilla {
@ -96,6 +101,8 @@ inline void ClearOnShutdown(SmartPtr *aPtr)
{ {
using namespace ClearOnShutdown_Internal; using namespace ClearOnShutdown_Internal;
MOZ_ASSERT(NS_IsMainThread());
MOZ_ASSERT(!sHasShutDown); MOZ_ASSERT(!sHasShutDown);
ShutdownObserver *observer = new PointerClearer<SmartPtr>(aPtr); ShutdownObserver *observer = new PointerClearer<SmartPtr>(aPtr);
sShutdownObservers.insertBack(observer); sShutdownObservers.insertBack(observer);
@ -107,6 +114,8 @@ inline void KillClearOnShutdown()
{ {
using namespace ClearOnShutdown_Internal; using namespace ClearOnShutdown_Internal;
MOZ_ASSERT(NS_IsMainThread());
ShutdownObserver *observer; ShutdownObserver *observer;
while ((observer = sShutdownObservers.popFirst())) { while ((observer = sShutdownObservers.popFirst())) {
observer->Shutdown(); observer->Shutdown();