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 1044245: don't track Windows IPC stack frames on non-gui threads r=bsmedberg

Browse Source
This commit is contained in:
Jim Mathies 2014-08-07 22:21:05 -04:00
parent e8dbd3d4c9
commit f26cd7d4ee
1 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
ipc/glue/WindowsMessageLoop.cpp
View File

@ -642,6 +642,11 @@ MessageChannel::SyncStackFrame::SyncStackFrame(MessageChannel* channel, bool int
, mPrev(mChannel->mTopFrame)
, mStaticPrev(sStaticTopFrame)
{
// Only track stack frames when we are on the gui thread.
if (GetCurrentThreadId() != gUIThreadId) {
return;
}
mChannel->mTopFrame = this;
sStaticTopFrame = this;
@ -654,6 +659,10 @@ MessageChannel::SyncStackFrame::SyncStackFrame(MessageChannel* channel, bool int
MessageChannel::SyncStackFrame::~SyncStackFrame()
{
if (GetCurrentThreadId() != gUIThreadId) {
return;
}
NS_ASSERTION(this == mChannel->mTopFrame,
"Mismatched interrupt stack frames");
NS_ASSERTION(this == sStaticTopFrame,
@ -692,6 +701,8 @@ MessageChannel::NotifyGeckoEventDispatch()
void
MessageChannel::ProcessNativeEventsInInterruptCall()
{
NS_ASSERTION(GetCurrentThreadId() == gUIThreadId,
"Shouldn't be on a non-main thread in here!");
if (!mTopFrame) {
NS_ERROR("Spin logic error: no Interrupt frame");
return;
@ -775,6 +786,10 @@ MessageChannel::WaitForSyncNotify()
MOZ_ASSERT(gUIThreadId, "InitUIThread was not called!");
// We jump through a lot of unique hoops in dealing with Windows message
// trapping to prevent re-entrancy when we are blocked waiting on a sync
// reply or new rpc in-call. However none of this overhead is needed when
// we aren't on the main (gui) thread.
if (GetCurrentThreadId() != gUIThreadId) {
PRIntervalTime timeout = (kNoTimeout == mTimeoutMs) ?
PR_INTERVAL_NO_TIMEOUT :
@ -795,9 +810,13 @@ MessageChannel::WaitForSyncNotify()
// If the timeout didn't expire, we know we received an event. The
// converse is not true.
return WaitResponse(timeout == PR_INTERVAL_NO_TIMEOUT ? false : IsTimeoutExpired(waitStart, timeout));
return WaitResponse(timeout == PR_INTERVAL_NO_TIMEOUT ?
false : IsTimeoutExpired(waitStart, timeout));
}
NS_ASSERTION(GetCurrentThreadId() == gUIThreadId,
"Shouldn't be on a non-main thread in here!");
NS_ASSERTION(mTopFrame && !mTopFrame->mInterrupt,
"Top frame is not a sync frame!");
@ -919,10 +938,16 @@ MessageChannel::WaitForInterruptNotify()
MOZ_ASSERT(gUIThreadId, "InitUIThread was not called!");
// Re-use sync notification wait code when we aren't on the
// gui thread, which bypasses the gui thread hoops we jump
// through in dealing with Windows messaging.
if (GetCurrentThreadId() != gUIThreadId) {
return WaitForSyncNotify();
}
NS_ASSERTION(GetCurrentThreadId() == gUIThreadId,
"Shouldn't be on a non-main thread in here!");
if (!InterruptStackDepth()) {
// There is currently no way to recover from this condition.
NS_RUNTIMEABORT("StackDepth() is 0 in call to MessageChannel::WaitForNotify!");