Differences From Artifact [0cbb2bba17]:
- File src/OFKernelEventObserver.m — part of check-in [0b478d8138] at 2020-10-31 18:27:34 on branch trunk — OFKernelEventObserver: Allow mutation in observe (user: js, size: 6336) [annotate] [blame] [check-ins using] [more...]
To Artifact [451fcb3cdf]:
- File
src/OFKernelEventObserver.m
— part of check-in
[d76213374e]
at
2020-11-29 02:44:17
on branch trunk
— OFKernelEventObserver: Reorder #ifdefs
Check for AmigaOS first, as we have a special implementation for it that
uses WaitSelect() instead. This way, we no longer need to match $host_os
to manually disable the pipe() check, which would break if one of the
AmigaOS variants adds pipe() later on. (user: js, size: 6384) [annotate] [blame] [check-ins using] [more...]
| ︙ | ︙ | |||
111 112 113 114 115 116 117 |
!defined(OF_NINTENDO_3DS)
socklen_t cancelAddrLen;
#endif
_readObjects = [[OFMutableArray alloc] init];
_writeObjects = [[OFMutableArray alloc] init];
| | | 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 |
!defined(OF_NINTENDO_3DS)
socklen_t cancelAddrLen;
#endif
_readObjects = [[OFMutableArray alloc] init];
_writeObjects = [[OFMutableArray alloc] init];
#if defined(OF_HAVE_PIPE) && !defined(OF_AMIGAOS)
if (pipe(_cancelFD))
@throw [OFInitializationFailedException
exceptionWithClass: self.class];
#elif !defined(OF_AMIGAOS)
_cancelFD[0] = _cancelFD[1] = socket(AF_INET, SOCK_DGRAM, 0);
if (_cancelFD[0] == INVALID_SOCKET)
|
| ︙ | ︙ | |||
172 173 174 175 176 177 178 |
}
return self;
}
- (void)dealloc
{
| | | 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 |
}
return self;
}
- (void)dealloc
{
#if defined(OF_HAVE_PIPE) && !defined(OF_AMIGAOS)
close(_cancelFD[0]);
if (_cancelFD[1] != _cancelFD[0])
close(_cancelFD[1]);
#elif !defined(OF_AMIGAOS)
closesocket(_cancelFD[0]);
if (_cancelFD[1] != _cancelFD[0])
closesocket(_cancelFD[1]);
|
| ︙ | ︙ | |||
255 256 257 258 259 260 261 |
- (void)observeUntilDate: (OFDate *)date
{
[self observeForTimeInterval: date.timeIntervalSinceNow];
}
- (void)cancel
{
| | < < > > | 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 |
- (void)observeUntilDate: (OFDate *)date
{
[self observeForTimeInterval: date.timeIntervalSinceNow];
}
- (void)cancel
{
#if defined(OF_AMIGAOS)
Forbid();
if (_waitingTask != NULL) {
Signal(_waitingTask, (1ul << _cancelSignal));
_waitingTask = NULL;
}
Permit();
#elif defined(OF_HAVE_PIPE)
OF_ENSURE(write(_cancelFD[1], "", 1) > 0);
#elif defined(OF_WII)
OF_ENSURE(sendto(_cancelFD[1], "", 1, 0,
(struct sockaddr *)&_cancelAddr, 8) > 0);
#else
OF_ENSURE(sendto(_cancelFD[1], (void *)"", 1, 0,
(struct sockaddr *)&_cancelAddr, sizeof(_cancelAddr)) > 0);
#endif
}
@end
|