Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-11 16:32:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset 3d4a094ac17e (bug 976790) for bustage on a CLOSED TREE.

Browse Source
This commit is contained in:
Ryan VanderMeulen 2014-02-26 16:52:29 -05:00
parent dd1b2d8290
commit 4608e9dce3
1 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ipc/glue/BackgroundImpl.cpp
View File

@ -4,7 +4,6 @@
#include "base/process_util.h"
#include "mozilla/Assertions.h"
#include "mozilla/Atomics.h"
#include "mozilla/ClearOnShutdown.h"
#include "mozilla/DebugOnly.h"
#include "mozilla/Services.h"
@ -142,7 +141,7 @@ private:
// This exists so that that [Assert]IsOnBackgroundThread() can continue to
// work during shutdown.
static Atomic<PRThread*> sBackgroundPRThread;
static PRThread* sBackgroundPRThread;
// This is only modified on the main thread. It is null if the thread does not
// exist or is shutting down.
@ -798,7 +797,7 @@ nsTArray<ParentImpl*>* ParentImpl::sLiveActorsForBackgroundThread;
StaticRefPtr<nsITimer> ParentImpl::sShutdownTimer;
Atomic<PRThread*> ParentImpl::sBackgroundPRThread = nullptr;
PRThread* ParentImpl::sBackgroundPRThread = nullptr;
MessageLoop* ParentImpl::sBackgroundThreadMessageLoop = nullptr;
@ -1250,17 +1249,17 @@ ParentImpl::RequestMessageLoopRunnable::Run()
#ifdef DEBUG
{
PRThread* currentPRThread = PR_GetCurrentThread();
MOZ_ASSERT(currentPRThread);
MOZ_ASSERT_IF(sBackgroundPRThread, currentPRThread != sBackgroundPRThread);
bool correctThread;
MOZ_ASSERT(NS_SUCCEEDED(mTargetThread->IsOnCurrentThread(&correctThread)));
MOZ_ASSERT(correctThread);
}
#endif
DebugOnly<PRThread*> oldBackgroundThread =
sBackgroundPRThread.exchange(PR_GetCurrentThread());
MOZ_ASSERT_IF(oldBackgroundThread,
PR_GetCurrentThread() != oldBackgroundThread);
sBackgroundPRThread = PR_GetCurrentThread();
MOZ_ASSERT(!mMessageLoop);
@ -1282,11 +1281,7 @@ NS_IMETHODIMP
ParentImpl::ShutdownBackgroundThreadRunnable::Run()
{
AssertIsInMainProcess();
// It is possible that another background thread was created while this thread
// was shutting down. In that case we can't assert anything about
// sBackgroundPRThread and we should not modify it here.
sBackgroundPRThread.compareExchange(PR_GetCurrentThread(), nullptr);
AssertIsOnBackgroundThread();
profiler_unregister_thread();