Differences From Artifact [48f0674f49]:
- File src/OFKernelEventObserver_epoll.m — part of check-in [dbbb4c7200] at 2015-05-09 21:38:52 on branch trunk — OFKernelEventObserver_epoll: Fix a typo (user: js, size: 5754) [annotate] [blame] [check-ins using]
To Artifact [02fb70080b]:
- File
src/OFKernelEventObserver_epoll.m
— part of check-in
[e9b4700cb6]
at
2015-12-29 21:33:07
on branch trunk
— 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: 5811) [annotate] [blame] [check-ins using] [more...]
| ︙ | ︙ | |||
152 153 154 155 156 157 158 | errNo: errno]; [_FDToEvents setValue: (void*)events forKey: (void*)(intptr_t)fd]; } } | | | | | < | 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 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 |
errNo: errno];
[_FDToEvents setValue: (void*)events
forKey: (void*)(intptr_t)fd];
}
}
- (void)addObjectForReading: (id <OFReadyForReadingObserving>)object
{
[self OF_addObject: object
fileDescriptor: [object fileDescriptorForReading]
events: EPOLLIN];
}
- (void)addObjectForWriting: (id <OFReadyForWritingObserving>)object
{
[self OF_addObject: object
fileDescriptor: [object fileDescriptorForWriting]
events: EPOLLOUT];
}
- (void)removeObjectForReading: (id <OFReadyForReadingObserving>)object
{
[self OF_removeObject: object
fileDescriptor: [object fileDescriptorForReading]
events: EPOLLIN];
}
- (void)removeObjectForWriting: (id <OFReadyForWritingObserving>)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_processReadBuffers];
objc_autoreleasePoolPop(pool);
events = epoll_wait(_epfd, eventList, EVENTLIST_SIZE,
(timeInterval != -1 ? timeInterval * 1000 : -1));
|
| ︙ | ︙ |