Differences From Artifact [1081329583]:
- File
src/OFKernelEventObserver_epoll.m
— part of check-in
[2a27cf3000]
at
2016-01-03 00:41:26
on branch trunk
— Update copyright
While at it, also update the mail address. (user: js, size: 6174) [annotate] [blame] [check-ins using] [more...]
To Artifact [f08643e4a0]:
- File
src/OFKernelEventObserver_epoll.m
— part of check-in
[b84490ab4f]
at
2016-03-20 12:05:46
on branch 0.8
— 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: 6113) [annotate] [blame] [check-ins using]
︙ | ︙ | |||
205 206 207 208 209 210 211 | events: EPOLLOUT objectsArray: _writeObjects]; } - (void)observeForTimeInterval: (of_time_interval_t)timeInterval { OFNull *nullObject = [OFNull null]; | < | | < | 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 | events: EPOLLOUT objectsArray: _writeObjects]; } - (void)observeForTimeInterval: (of_time_interval_t)timeInterval { OFNull *nullObject = [OFNull null]; struct epoll_event eventList[EVENTLIST_SIZE]; int i, events; if ([self OF_processReadBuffers]) return; events = epoll_wait(_epfd, eventList, EVENTLIST_SIZE, (timeInterval != -1 ? timeInterval * 1000 : -1)); if (events < 0) @throw [OFObserveFailedException exceptionWithObserver: self errNo: errno]; |
︙ | ︙ |