Differences From Artifact [463d24baf5]:
- File src/OFKernelEventObserver_epoll.m — part of check-in [bbe4040126] at 2015-05-04 20:34:57 on branch trunk — Refactor OFKernelEventObserver (user: js, size: 5953) [annotate] [blame] [check-ins using]
To Artifact [8f646c7ee8]:
- File
src/OFKernelEventObserver_epoll.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: 5754) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
180 181 182 183 184 185 186 |
- (void)OF_removeObjectForWriting: (id)object
{
[self OF_removeObject: object
fileDescriptor: [object fileDescriptorForWriting]
events: EPOLLOUT];
}
| | | < | < < < < < < < < < < | < < < < < | 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 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 |
- (void)OF_removeObjectForWriting: (id)object
{
[self OF_removeObject: object
fileDescriptor: [object fileDescriptorForWriting]
events: EPOLLOUT];
}
- (void)observeForTimeInterval: (of_time_interval_t)timeInterval
{
OFNull *nullObject = [OFNull null];
void *pool = objc_autoreleasePoolPush();
struct epoll_event eventList[EVENTLIST_SIZE];
int i, events;
[self OF_processQueueAndStoreRemovedIn: nil];
[self OF_processReadBuffers];
objc_autoreleasePoolPop(pool);
events = epoll_wait(_epfd, eventList, EVENTLIST_SIZE,
(timeInterval != -1 ? timeInterval * 1000 : -1));
if (events < 0)
return [OFObserveFailedException exceptionWithObserver: self
errNo: errno];
for (i = 0; i < events; i++) {
if (eventList[i].data.ptr == nullObject) {
char buffer;
assert(eventList[i].events == EPOLLIN);
OF_ENSURE(read(_cancelFD[0], &buffer, 1) == 1);
continue;
}
if (eventList[i].events & EPOLLIN) {
pool = objc_autoreleasePoolPush();
if ([_delegate respondsToSelector:
@selector(objectIsReadyForReading:)])
[_delegate objectIsReadyForReading:
eventList[i].data.ptr];
objc_autoreleasePoolPop(pool);
}
if (eventList[i].events & EPOLLOUT) {
pool = objc_autoreleasePoolPush();
if ([_delegate respondsToSelector:
@selector(objectIsReadyForWriting:)])
[_delegate objectIsReadyForWriting:
eventList[i].data.ptr];
objc_autoreleasePoolPop(pool);
}
assert((eventList[i].events & ~(EPOLLIN | EPOLLOUT)) == 0);
}
}
@end
|