Differences From Artifact [948bc3a27e]:
- File src/OFKernelEventObserver_poll.m — part of check-in [13d72034ed] at 2015-05-16 18:28:47 on branch trunk — OFKernelEventObserver_poll: Exception -> assert (user: js, size: 4484) [annotate] [blame] [check-ins using]
To Artifact [7dfa12138b]:
- File
src/OFKernelEventObserver_poll.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: 4526) [annotate] [blame] [check-ins using]
1 | /* | | | | 1 2 3 4 5 6 7 8 9 10 | /* * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016 * Jonathan Schleifer <js@heap.zone> * * All rights reserved. * * This file is part of ObjFW. It may be distributed under the terms of the * Q Public License 1.0, which can be found in the file LICENSE.QPL included in * the packaging of this file. * |
| ︙ | ︙ | |||
122 123 124 125 126 127 128 129 130 |
break;
}
}
}
- (void)OF_addObjectForReading: (id)object
{
[self OF_addObject: object
| > | > | > | > | < | > | | < > > > > > > > | | 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 189 190 191 192 193 194 195 196 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 229 230 |
break;
}
}
}
- (void)OF_addObjectForReading: (id)object
fileDescriptor: (int)fd
{
[self OF_addObject: object
fileDescriptor: fd
events: POLLIN];
}
- (void)OF_addObjectForWriting: (id)object
fileDescriptor: (int)fd
{
[self OF_addObject: object
fileDescriptor: fd
events: POLLOUT];
}
- (void)OF_removeObjectForReading: (id)object
fileDescriptor: (int)fd
{
[self OF_removeObject: object
fileDescriptor: fd
events: POLLIN];
}
- (void)OF_removeObjectForWriting: (id)object
fileDescriptor: (int)fd
{
[self OF_removeObject: object
fileDescriptor: fd
events: POLLOUT];
}
- (void)observeForTimeInterval: (of_time_interval_t)timeInterval
{
struct pollfd *FDs;
int events;
size_t i, nFDs;
[self OF_processQueue];
if ([self OF_processReadBuffers])
return;
FDs = [_FDs items];
nFDs = [_FDs count];
#ifdef OPEN_MAX
if (nFDs > OPEN_MAX)
@throw [OFOutOfRangeException exception];
#endif
events = poll(FDs, (nfds_t)nFDs,
(int)(timeInterval != -1 ? timeInterval * 1000 : -1));
if (events < 0)
@throw [OFObserveFailedException exceptionWithObserver: self
errNo: errno];
for (i = 0; i < nFDs; i++) {
assert(FDs[i].fd <= _maxFD);
if (FDs[i].revents & POLLIN) {
void *pool;
if (FDs[i].fd == _cancelFD[0]) {
char buffer;
#ifdef OF_HAVE_PIPE
OF_ENSURE(read(_cancelFD[0], &buffer, 1) == 1);
#else
OF_ENSURE(recvfrom(_cancelFD[0], &buffer, 1,
0, NULL, NULL) == 1);
#endif
FDs[i].revents = 0;
continue;
}
pool = objc_autoreleasePoolPush();
if ([_delegate respondsToSelector:
@selector(objectIsReadyForReading:)])
[_delegate objectIsReadyForReading:
_FDToObject[FDs[i].fd]];
objc_autoreleasePoolPop(pool);
}
if (FDs[i].revents & POLLOUT) {
void *pool = objc_autoreleasePoolPush();
if ([_delegate respondsToSelector:
@selector(objectIsReadyForWriting:)])
[_delegate objectIsReadyForWriting:
_FDToObject[FDs[i].fd]];
objc_autoreleasePoolPop(pool);
}
FDs[i].revents = 0;
}
}
@end
|