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

Bug 1191143 - Cancel CPOWs from both sides (r=dvander)

Browse Source
This commit is contained in:
Bill McCloskey 2015-07-13 14:14:13 -07:00
parent 43a087cc38
commit e633fa0e76
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ipc/glue/MessageChannel.cpp
View File

@ -106,7 +106,7 @@ struct RunnableMethodTraits<mozilla::ipc::MessageChannel>
DebugAbort(__FILE__, __LINE__, #_cond,## __VA_ARGS__); \
} while (0)
static MessageChannel* gParentProcessBlocker;
static MessageChannel* gMainThreadBlocker;
namespace mozilla {
namespace ipc {
@ -404,8 +404,8 @@ MessageChannel::Clear()
// In practice, mListener owns the channel, so the channel gets deleted
// before mListener. But just to be safe, mListener is a weak pointer.
if (gParentProcessBlocker == this) {
gParentProcessBlocker = nullptr;
if (gMainThreadBlocker == this) {
gMainThreadBlocker = nullptr;
}
mDequeueOneTask->Cancel();
@ -1334,7 +1334,7 @@ MessageChannel::DispatchSyncMessage(const Message& aMsg, Message*& aReply)
MaybeScriptBlocker scriptBlocker(this, prio > IPC::Message::PRIORITY_NORMAL);
MessageChannel* dummy;
MessageChannel*& blockingVar = ShouldBlockScripts() ? gParentProcessBlocker : dummy;
MessageChannel*& blockingVar = NS_IsMainThread() ? gMainThreadBlocker : dummy;
Result rv;
if (mTimedOutMessageSeqno && mTimedOutMessagePriority >= prio) {
@ -2046,22 +2046,25 @@ MessageChannel::CancelCurrentTransactionInternal()
// see if mCurrentTransaction is 0 before examining DispatchSyncMessage.
}
void
bool
MessageChannel::CancelCurrentTransaction()
{
MonitorAutoLock lock(*mMonitor);
if (mCurrentTransaction) {
if (mCurrentTransaction &&
(DispatchingSyncMessagePriority() >= IPC::Message::PRIORITY_HIGH))
{
CancelCurrentTransactionInternal();
mLink->SendMessage(new CancelMessage());
return true;
}
return false;
}
void
CancelCPOWs()
{
if (gParentProcessBlocker) {
if (gMainThreadBlocker && gMainThreadBlocker->CancelCurrentTransaction()) {
mozilla::Telemetry::Accumulate(mozilla::Telemetry::IPC_TRANSACTION_CANCEL, true);
gParentProcessBlocker->CancelCurrentTransaction();
}
}

2
ipc/glue/MessageChannel.h
View File

@ -143,7 +143,7 @@ class MessageChannel : HasResultCodes
return !mCxxStackFrames.empty();
}
void CancelCurrentTransaction();
bool CancelCurrentTransaction();
/**
* This function is used by hang annotation code to determine which IPDL