Bug 679240 - Split total channel timeout into two discrete wait periods. Avoids aborting children after system sleep. r=bsmedberg
This commit is contained in:
@@ -741,7 +741,7 @@ SyncChannel::WaitForNotify()
|
||||
|
||||
MonitorAutoUnlock unlock(*mMonitor);
|
||||
|
||||
bool retval = true;
|
||||
bool timedout = false;
|
||||
|
||||
UINT_PTR timerId = NULL;
|
||||
TimeoutData timeoutData = { 0 };
|
||||
@@ -795,7 +795,7 @@ SyncChannel::WaitForNotify()
|
||||
|
||||
if (TimeoutHasExpired(timeoutData)) {
|
||||
// A timeout was specified and we've passed it. Break out.
|
||||
retval = false;
|
||||
timedout = true;
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -847,7 +847,7 @@ SyncChannel::WaitForNotify()
|
||||
|
||||
SyncChannel::SetIsPumpingMessages(false);
|
||||
|
||||
return retval;
|
||||
return WaitResponse(timedout);
|
||||
}
|
||||
|
||||
bool
|
||||
@@ -868,7 +868,7 @@ RPCChannel::WaitForNotify()
|
||||
|
||||
MonitorAutoUnlock unlock(*mMonitor);
|
||||
|
||||
bool retval = true;
|
||||
bool timedout = false;
|
||||
|
||||
UINT_PTR timerId = NULL;
|
||||
TimeoutData timeoutData = { 0 };
|
||||
@@ -949,7 +949,7 @@ RPCChannel::WaitForNotify()
|
||||
|
||||
if (TimeoutHasExpired(timeoutData)) {
|
||||
// A timeout was specified and we've passed it. Break out.
|
||||
retval = false;
|
||||
timedout = true;
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -987,7 +987,7 @@ RPCChannel::WaitForNotify()
|
||||
|
||||
SyncChannel::SetIsPumpingMessages(false);
|
||||
|
||||
return retval;
|
||||
return WaitResponse(timedout);
|
||||
}
|
||||
|
||||
void
|
||||
|
||||
Reference in New Issue
Block a user