Differences From Artifact [306f8337d7]:
- File
src/OFKernelEventObserver_kqueue.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: 5089) [annotate] [blame] [check-ins using]
To Artifact [9085a7dddc]:
- File
src/OFKernelEventObserver_kqueue.m
— part of check-in
[c5f0c5f9ba]
at
2015-12-29 21:42:38
on branch 0.8
— Refactor OFKernelEventObserver
This moves the locked queue for actions to
OFKernelEventObserver_LockedQueue, which is now used for select and
poll, but skipped for kqueue and epoll, as they natively support changes
from another thread.This fixes the problem that removing an object is delayed until the next
observe call - at which point it might have already been closed, meaning
the fd is no longer available. This was mainly a problem with kqueue, as
closing the fd already removed it from the kqueue, which then resulted
in an error being returned when trying to manually remove the fd from
the kqueue. (user: js, size: 5125) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
58 59 60 61 62 63 64 | @throw [OFInitializationFailedException exceptionWithClass: [self class]]; if ((flags = fcntl(_kernelQueue, F_GETFD, 0)) != -1) fcntl(_kernelQueue, F_SETFD, flags | FD_CLOEXEC); #endif | < < < < > > > < < < | < < < | > > > | < < < | > > > | | > > > > | | > > > > < < < < < < | < < < < | 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 |
@throw [OFInitializationFailedException
exceptionWithClass: [self class]];
if ((flags = fcntl(_kernelQueue, F_GETFD, 0)) != -1)
fcntl(_kernelQueue, F_SETFD, flags | FD_CLOEXEC);
#endif
EV_SET(&event, _cancelFD[0], EVFILT_READ, EV_ADD, 0, 0, 0);
if (kevent(_kernelQueue, &event, 1, NULL, 0, NULL) != 0)
@throw [OFInitializationFailedException
exceptionWithClass: [self class]];
} @catch (id e) {
[self release];
@throw e;
}
return self;
}
- (void)dealloc
{
close(_kernelQueue);
[super dealloc];
}
- (void)addObjectForReading: (id <OFReadyForReadingObserving>)object
{
struct kevent event;
memset(&event, 0, sizeof(event));
event.ident = [object fileDescriptorForReading];
event.filter = EVFILT_READ;
event.flags = EV_ADD;
#ifndef __NetBSD__
event.udata = object;
#else
event.udata = (intptr_t)object;
#endif
if (kevent(_kernelQueue, &event, 1, NULL, 0, NULL) != 0)
@throw [OFObserveFailedException
exceptionWithObserver: self
errNo: errno];
}
- (void)addObjectForWriting: (id <OFReadyForWritingObserving>)object
{
struct kevent event;
memset(&event, 0, sizeof(event));
event.ident = [object fileDescriptorForWriting];
event.filter = EVFILT_WRITE;
event.flags = EV_ADD;
#ifndef __NetBSD__
event.udata = object;
#else
event.udata = (intptr_t)object;
#endif
if (kevent(_kernelQueue, &event, 1, NULL, 0, NULL) != 0)
@throw [OFObserveFailedException
exceptionWithObserver: self
errNo: errno];
}
- (void)removeObjectForReading: (id <OFReadyForReadingObserving>)object
{
struct kevent event;
memset(&event, 0, sizeof(event));
event.ident = [object fileDescriptorForReading];
event.filter = EVFILT_READ;
event.flags = EV_DELETE;
if (kevent(_kernelQueue, &event, 1, NULL, 0, NULL) != 0)
@throw [OFObserveFailedException
exceptionWithObserver: self
errNo: errno];
}
- (void)removeObjectForWriting: (id <OFReadyForWritingObserving>)object
{
struct kevent event;
memset(&event, 0, sizeof(event));
event.ident = [object fileDescriptorForWriting];
event.filter = EVFILT_WRITE;
event.flags = EV_DELETE;
if (kevent(_kernelQueue, &event, 1, NULL, 0, NULL) != 0)
@throw [OFObserveFailedException
exceptionWithObserver: self
errNo: errno];
}
- (void)observeForTimeInterval: (of_time_interval_t)timeInterval
{
void *pool = objc_autoreleasePoolPush();
struct timespec timeout;
struct kevent eventList[EVENTLIST_SIZE];
int i, events;
timeout.tv_sec = (time_t)timeInterval;
timeout.tv_nsec = lrint((timeInterval - timeout.tv_sec) * 1000000000);
[self OF_processReadBuffers];
objc_autoreleasePoolPop(pool);
events = kevent(_kernelQueue, NULL, 0, eventList, EVENTLIST_SIZE,
(timeInterval != -1 ? &timeout : NULL));
if (events < 0)
@throw [OFObserveFailedException exceptionWithObserver: self
errNo: errno];
for (i = 0; i < events; i++) {
if (eventList[i].flags & EV_ERROR)
@throw [OFObserveFailedException
exceptionWithObserver: self
errNo: (int)eventList[i].data];
if (eventList[i].ident == _cancelFD[0]) {
|
| ︙ | ︙ |