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

Bug 545338: Make the IPC hang detector tolerate spurious wake-ups. Possibly temporary. irc-r=jimm

Browse Source 
--HG--
extra : transplant_source : E%DC%C1%E1%0Dv%E1%F4%1DN0%AD%95b%AA%EFXi%F9%1F
This commit is contained in:
Chris Jones 2010-02-10 15:41:44 -06:00
parent 02e1abfaad
commit 9b71f6eb76
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ipc/glue/RPCChannel.cpp
View File

@ -166,10 +166,7 @@ RPCChannel::Call(Message* msg, Message* reply)
if (EventOccurred())
break;
// an event didn't occur. So we better have timed out!
NS_ABORT_IF_FALSE(maybeTimedOut,
"neither received a reply nor detected a hang!");
if (!ShouldContinueFromTimeout())
if (maybeTimedOut && !ShouldContinueFromTimeout())
return false;
}

5
ipc/glue/SyncChannel.cpp
View File

@ -114,10 +114,7 @@ SyncChannel::Send(Message* msg, Message* reply)
if (EventOccurred())
break;
// an event didn't occur. So we better have timed out!
NS_ABORT_IF_FALSE(maybeTimedOut,
"neither received a reply nor detected a hang!");
if (!ShouldContinueFromTimeout())
if (maybeTimedOut && !ShouldContinueFromTimeout())
return false;
}