Differences From Artifact [80d7681218]:
- File src/OFKernelEventObserver.m — part of check-in [bbe4040126] at 2015-05-04 20:34:57 on branch trunk — Refactor OFKernelEventObserver (user: js, size: 8160) [annotate] [blame] [check-ins using]
To Artifact [b099b55bf8]:
- File
src/OFKernelEventObserver.m
— part of check-in
[220513a3f5]
at
2015-05-09 18:13:19
on branch trunk
— More OFKernelEventObserver refactoring
This was necessary because select(), poll() and kevent() on FreeBSD and
OS X would sometimes return 0 events, even if there are some, and
sometimes return the correct number of events that were pending, meaning
the number of events returned is unreliable. To make things worse,
whether it returns 0 or the number of events that were pending is
completely non-deterministic on both FreeBSD and OS X (running the same
tests multiple times in a row would make it sometimes work and sometimes
fail).In order to prevent code from depending on the return value of
-[observeForTimeInterval:] (which would depend on select(), poll() and
kevent() returning the correct number), OFKernelObserver no longer
returns whether there were pending events. It is expected that
-[observe] or -[observeForTimeInterval:] is just called in a loop as
long as events should be handled.The tests have been changed as well to reflect this. What they do now is
set a deadline and call -[observeForTimeInterval:] with a small timeout
in a loop until the deadline is reached or all events have been handled.Note: DragonFlyBSD has not been tested, but will most likely behave like
FreeBSD and OS X. (user: js, size: 7927) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
336 337 338 339 340 341 342 |
}
- (void)observe
{
[self observeForTimeInterval: -1];
}
| | | | | < | | | | < < < | < < < < < < < < < | 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 |
}
- (void)observe
{
[self observeForTimeInterval: -1];
}
- (void)observeForTimeInterval: (of_time_interval_t)timeInterval
{
OF_UNRECOGNIZED_SELECTOR
}
- (void)observeUntilDate: (OFDate*)date
{
[self observeForTimeInterval: [date timeIntervalSinceNow]];
}
- (void)cancel
{
#ifdef OF_HAVE_PIPE
OF_ENSURE(write(_cancelFD[1], "", 1) > 0);
#else
OF_ENSURE(sendto(_cancelFD[1], "", 1, 0, (struct sockaddr*)&_cancelAddr,
sizeof(_cancelAddr)) > 0);
#endif
}
- (void)OF_processReadBuffers
{
id const *objects = [_readObjects objects];
size_t i, count = [_readObjects count];
for (i = 0; i < count; i++) {
void *pool = objc_autoreleasePoolPush();
if ([objects[i] isKindOfClass: [OFStream class]] &&
[objects[i] hasDataInReadBuffer] &&
![objects[i] OF_isWaitingForDelimiter] &&
[_delegate respondsToSelector:
@selector(objectIsReadyForReading:)])
[_delegate objectIsReadyForReading: objects[i]];
objc_autoreleasePoolPop(pool);
}
}
@end
|