Differences From Artifact [ccbb902e19]:
- File
src/OFKernelEventObserver_epoll.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: 6114) [annotate] [blame] [check-ins using]
To Artifact [d65aafd84c]:
- File
src/OFKernelEventObserver_epoll.m
— part of check-in
[45518ae7b7]
at
2016-03-20 14:07:47
on branch trunk
— Use the locked queue for kqueue and epoll as well
_readObjects must only be changed from the thread running the observer
and not from a thread adding or removing objects to observe. This is
already handled by the locked queue used by poll and select, so the best
way to solve this is to use the locked queue for kqueue and epoll as
well. (user: js, size: 5499) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
88 89 90 91 92 93 94 |
[super dealloc];
}
- (void)OF_addObject: (id)object
fileDescriptor: (int)fd
events: (int)addEvents
| < < < < < | | | < | | | < < < | | < | < | | < | | < < < < < < < < < < | | < | | | | | | | | | | | | | | | | | | | | < < < < | < < < | | < | | < | | < | | < > > | 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 183 184 185 186 187 188 |
[super dealloc];
}
- (void)OF_addObject: (id)object
fileDescriptor: (int)fd
events: (int)addEvents
{
struct epoll_event event;
intptr_t events;
events = (intptr_t)[_FDToEvents valueForKey: (void*)(intptr_t)fd];
memset(&event, 0, sizeof(event));
event.events = (int)events | addEvents;
event.data.ptr = object;
if (epoll_ctl(_epfd, (events == 0 ? EPOLL_CTL_ADD : EPOLL_CTL_MOD),
fd, &event) == -1)
@throw [OFObserveFailedException exceptionWithObserver: self
errNo: errno];
[_FDToEvents setValue: (void*)(events | addEvents)
forKey: (void*)(intptr_t)fd];
}
- (void)OF_removeObject: (id)object
fileDescriptor: (int)fd
events: (int)removeEvents
{
intptr_t events;
events = (intptr_t)[_FDToEvents valueForKey: (void*)(intptr_t)fd];
events &= ~removeEvents;
if (events == 0) {
if (epoll_ctl(_epfd, EPOLL_CTL_DEL, fd, NULL) == -1)
@throw [OFObserveFailedException
exceptionWithObserver: self
errNo: errno];
[_FDToEvents removeValueForKey: (void*)(intptr_t)fd];
} else {
struct epoll_event event;
memset(&event, 0, sizeof(event));
event.events = (int)events;
event.data.ptr = object;
if (epoll_ctl(_epfd, EPOLL_CTL_MOD, fd, &event) == -1)
@throw [OFObserveFailedException
exceptionWithObserver: self
errNo: errno];
[_FDToEvents setValue: (void*)events
forKey: (void*)(intptr_t)fd];
}
}
- (void)OF_addObjectForReading: (id <OFReadyForReadingObserving>)object
{
[self OF_addObject: object
fileDescriptor: [object fileDescriptorForReading]
events: EPOLLIN];
}
- (void)OF_addObjectForWriting: (id <OFReadyForWritingObserving>)object
{
[self OF_addObject: object
fileDescriptor: [object fileDescriptorForWriting]
events: EPOLLOUT];
}
- (void)OF_removeObjectForReading: (id <OFReadyForReadingObserving>)object
{
[self OF_removeObject: object
fileDescriptor: [object fileDescriptorForReading]
events: EPOLLIN];
}
- (void)OF_removeObjectForWriting: (id <OFReadyForWritingObserving>)object
{
[self OF_removeObject: object
fileDescriptor: [object fileDescriptorForWriting]
events: EPOLLOUT];
}
- (void)observeForTimeInterval: (of_time_interval_t)timeInterval
{
OFNull *nullObject = [OFNull null];
struct epoll_event eventList[EVENTLIST_SIZE];
int events;
[self OF_processQueue];
if ([self OF_processReadBuffers])
return;
events = epoll_wait(_epfd, eventList, EVENTLIST_SIZE,
(timeInterval != -1 ? timeInterval * 1000 : -1));
|
| ︙ | ︙ | |||
229 230 231 232 233 234 235 |
assert(eventList[i].events == EPOLLIN);
OF_ENSURE(read(_cancelFD[0], &buffer, 1) == 1);
continue;
}
if (eventList[i].events & EPOLLIN) {
| | | | 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 |
assert(eventList[i].events == EPOLLIN);
OF_ENSURE(read(_cancelFD[0], &buffer, 1) == 1);
continue;
}
if (eventList[i].events & EPOLLIN) {
void *pool = objc_autoreleasePoolPush();
if ([_delegate respondsToSelector:
@selector(objectIsReadyForReading:)])
[_delegate objectIsReadyForReading:
eventList[i].data.ptr];
objc_autoreleasePoolPop(pool);
}
if (eventList[i].events & EPOLLOUT) {
void *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
|