Differences From Artifact [3a4bb0d8ec]:
- File src/OFKernelEventObserver_select.m — part of check-in [734fbbb144] at 2015-06-01 18:27:40 on branch trunk — OFKernelEventObserver_select: Small Win64 fix (user: js, size: 4712) [annotate] [blame] [check-ins using]
To Artifact [bb7655fa57]:
- File
src/OFKernelEventObserver_select.m
— part of check-in
[85917ea0dd]
at
2016-03-20 14:19:43
on branch 0.8
— 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: 4893) [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. * |
| ︙ | ︙ | |||
58 59 60 61 62 63 64 | @throw [OFOutOfRangeException exception]; _maxFD = (int)_cancelFD[0]; return self; } | | | | | > > > > > | | > > > > > < | > | | < | 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 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 |
@throw [OFOutOfRangeException exception];
_maxFD = (int)_cancelFD[0];
return self;
}
- (void)OF_addObjectForReading: (id <OFReadyForReadingObserving>)object
{
int fd = [object fileDescriptorForReading];
if (fd < 0 || fd > INT_MAX - 1)
@throw [OFOutOfRangeException exception];
#ifndef _WIN32
if (fd >= FD_SETSIZE)
@throw [OFOutOfRangeException exception];
#endif
if (fd > _maxFD)
_maxFD = fd;
FD_SET(fd, &_readFDs);
}
- (void)OF_addObjectForWriting: (id <OFReadyForWritingObserving>)object
{
int fd = [object fileDescriptorForWriting];
if (fd < 0 || fd > INT_MAX - 1)
@throw [OFOutOfRangeException exception];
#ifndef _WIN32
if (fd >= FD_SETSIZE)
@throw [OFOutOfRangeException exception];
#endif
if (fd > _maxFD)
_maxFD = fd;
FD_SET(fd, &_writeFDs);
}
- (void)OF_removeObjectForReading: (id <OFReadyForReadingObserving>)object
{
/* TODO: Adjust _maxFD */
int fd = [object fileDescriptorForReading];
if (fd < 0)
@throw [OFOutOfRangeException exception];
#ifndef _WIN32
if (fd >= FD_SETSIZE)
@throw [OFOutOfRangeException exception];
#endif
FD_CLR(fd, &_readFDs);
}
- (void)OF_removeObjectForWriting: (id <OFReadyForWritingObserving>)object
{
/* TODO: Adjust _maxFD */
int fd = [object fileDescriptorForWriting];
if (fd < 0)
@throw [OFOutOfRangeException exception];
#ifndef _WIN32
if (fd >= FD_SETSIZE)
@throw [OFOutOfRangeException exception];
#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;
|
| ︙ | ︙ | |||
164 165 166 167 168 169 170 |
if (events < 0)
@throw [OFObserveFailedException exceptionWithObserver: self
errNo: errno];
if (FD_ISSET(_cancelFD[0], &readFDs)) {
char buffer;
| | < < | | < < | | | 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 |
if (events < 0)
@throw [OFObserveFailedException exceptionWithObserver: self
errNo: errno];
if (FD_ISSET(_cancelFD[0], &readFDs)) {
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
}
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
|