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

Bug 1221540: OS X IPC timeout retry with a longer interval. r=milan

Browse Source 
--HG--
extra : commitid : 2p6mF7bRulV
This commit is contained in:
George Wright 2015-12-24 12:54:07 -05:00
parent 1c5ba02c87
commit 38a0fd26ee
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ipc/glue/SharedMemoryBasic_mach.mm
View File

@ -107,6 +107,7 @@ enum {
};
const int kTimeout = 1000;
const int kLongTimeout = 60 * kTimeout;
pid_t gParentPid = 0;
@ -616,8 +617,14 @@ SharedMemoryBasic::ShareToProcess(base::ProcessId pid,
MachReceiveMessage msg;
err = ports->mReceiver->WaitForMessage(&msg, kTimeout);
if (err != KERN_SUCCESS) {
LOG_ERROR("didn't get an id %s %x\n", mach_error_string(err), err);
return false;
LOG_ERROR("short timeout didn't get an id %s %x\n", mach_error_string(err), err);
MOZ_ASSERT(false, "Receiver message short time out");
err = ports->mReceiver->WaitForMessage(&msg, kLongTimeout);
if (err != KERN_SUCCESS) {
LOG_ERROR("long timeout didn't get an id %s %x\n", mach_error_string(err), err);
return false;
}
}
if (msg.GetDataLength() != sizeof(SharePortsReply)) {
LOG_ERROR("Improperly formatted reply\n");