Differences From Artifact [8f5e338344]:
- File
src/OFKernelEventObserver_select.m
— part of check-in
[cec0f072f8]
at
2016-01-03 00:43:58
on branch 0.8
— Update copyright
While at it, also update the mail address. (user: js, size: 4765) [annotate] [blame] [check-ins using]
To Artifact [fe3f6e4f8e]:
- File
src/OFKernelEventObserver_select.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: 4703) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
126 127 128 129 130 131 132 |
#endif
FD_CLR(fd, &_writeFDs);
}
- (void)observeForTimeInterval: (of_time_interval_t)timeInterval
{
| < > | | < | 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 |
#endif
FD_CLR(fd, &_writeFDs);
}
- (void)observeForTimeInterval: (of_time_interval_t)timeInterval
{
id const *objects;
fd_set readFDs;
fd_set writeFDs;
struct timeval timeout;
int events;
size_t i, count;
[self OF_processQueue];
if ([self OF_processReadBuffers])
return;
#ifdef FD_COPY
FD_COPY(&_readFDs, &readFDs);
FD_COPY(&_writeFDs, &writeFDs);
#else
readFDs = _readFDs;
writeFDs = _writeFDs;
|
| ︙ | ︙ | |||
182 183 184 185 186 187 188 |
#endif
}
objects = [_readObjects objects];
count = [_readObjects count];
for (i = 0; i < count; i++) {
| < < | | < < | | | 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 |
#endif
}
objects = [_readObjects objects];
count = [_readObjects count];
for (i = 0; i < count; i++) {
void *pool = objc_autoreleasePoolPush();
int fd = [objects[i] fileDescriptorForReading];
if (FD_ISSET(fd, &readFDs) && [_delegate respondsToSelector:
@selector(objectIsReadyForReading:)])
[_delegate objectIsReadyForReading: objects[i]];
objc_autoreleasePoolPop(pool);
}
objects = [_writeObjects objects];
count = [_writeObjects count];
for (i = 0; i < count; i++) {
void *pool = objc_autoreleasePoolPush();
int fd = [objects[i] fileDescriptorForWriting];
if (FD_ISSET(fd, &writeFDs) && [_delegate respondsToSelector:
@selector(objectIsReadyForWriting:)])
[_delegate objectIsReadyForWriting: objects[i]];
objc_autoreleasePoolPop(pool);
}
}
@end
|