Differences From Artifact [6945083a36]:
- File src/OFKernelEventObserver_kqueue.m — part of check-in [e0b9167693] at 2016-02-21 15:37:42 on branch trunk — Make use of C99-style for loops (user: js, size: 5968) [annotate] [blame] [check-ins using]
To Artifact [240d5f78f9]:
- File
src/OFKernelEventObserver_kqueue.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: 5922) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
201 202 203 204 205 206 207 |
[_mutex unlock];
}
#endif
}
- (void)observeForTimeInterval: (of_time_interval_t)timeInterval
{
| < > > > < < < < > > | 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 |
[_mutex unlock];
}
#endif
}
- (void)observeForTimeInterval: (of_time_interval_t)timeInterval
{
struct timespec timeout;
struct kevent eventList[EVENTLIST_SIZE];
int events;
if ([self OF_processReadBuffers])
return;
timeout.tv_sec = (time_t)timeInterval;
timeout.tv_nsec = lrint((timeInterval - timeout.tv_sec) * 1000000000);
events = kevent(_kernelQueue, NULL, 0, eventList, EVENTLIST_SIZE,
(timeInterval != -1 ? &timeout : NULL));
if (events < 0)
@throw [OFObserveFailedException exceptionWithObserver: self
errNo: errno];
for (int i = 0; i < events; i++) {
void *pool;
if (eventList[i].flags & EV_ERROR)
@throw [OFObserveFailedException
exceptionWithObserver: self
errNo: (int)eventList[i].data];
if (eventList[i].ident == _cancelFD[0]) {
char buffer;
|
| ︙ | ︙ |