Differences From Artifact [5d44afb3d5]:
- File src/OFKernelEventObserver.m — part of check-in [cb0fd980f9] at 2016-01-03 01:14:27 on branch trunk — Make more use of fast enumeration (user: js, size: 5288) [annotate] [blame] [check-ins using]
To Artifact [1613a72d1b]:
- File
src/OFKernelEventObserver.m
— part of check-in
[7ae17af9f0]
at
2016-03-20 11:57:06
on branch trunk
— Never block when the read buffer is non-empty
This was broken by 88f2f03. The problem only existed when something was
in the read buffer, but not processed completely, as after processing
the read buffer, it would go on to wait for data - but since not the
entire read buffer had been processed, it meant there was still data
left there that needed to be handled first. (user: js, size: 5487) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
211 212 213 214 215 216 217 | # else OF_ENSURE(sendto(_cancelFD[1], "", 1, 0, (struct sockaddr*)&_cancelAddr, 8) > 0); # endif #endif } | | > > | | | | > > > | > > > > > > | 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 |
# else
OF_ENSURE(sendto(_cancelFD[1], "", 1, 0,
(struct sockaddr*)&_cancelAddr, 8) > 0);
# endif
#endif
}
- (bool)OF_processReadBuffers
{
bool foundInReadBuffer = false;
for (id object in _readObjects) {
void *pool = objc_autoreleasePoolPush();
if ([object isKindOfClass: [OFStream class]] &&
[object hasDataInReadBuffer] &&
![object OF_isWaitingForDelimiter]) {
if ([_delegate respondsToSelector:
@selector(objectIsReadyForReading:)])
[_delegate objectIsReadyForReading: object];
foundInReadBuffer = true;
}
objc_autoreleasePoolPop(pool);
}
/*
* As long as we have data in the read buffer for any stream, we don't
* want to block.
*/
return foundInReadBuffer;
}
@end
|