Differences From Artifact [898e307ee4]:
- File
src/OFKernelEventObserver.m
— part of check-in
[e9b4700cb6]
at
2015-12-29 21:33:07
on branch trunk
— Refactor OFKernelEventObserver
This moves the locked queue for actions to
OFKernelEventObserver_LockedQueue, which is now used for select and
poll, but skipped for kqueue and epoll, as they natively support changes
from another thread.This fixes the problem that removing an object is delayed until the next
observe call - at which point it might have already been closed, meaning
the fd is no longer available. This was mainly a problem with kqueue, as
closing the fd already removed it from the kqueue, which then resulted
in an error being returned when trying to manually remove the fd from
the kqueue. (user: js, size: 5216) [annotate] [blame] [check-ins using]
To Artifact [952d94c390]:
- File
src/OFKernelEventObserver.m
— part of check-in
[258b8a4944]
at
2016-01-03 00:35:01
on branch trunk
— Fix a regression from the previous refactorization
kqueue and epoll were not updating _readObjects and _writeObjects
anymore, since this was done by the queue handling code, which they no
longer use after the refactorization. (user: js, size: 5383) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
23 24 25 26 27 28 29 30 31 32 33 34 35 36 | #import "OFArray.h" #import "OFStream.h" #import "OFStream+Private.h" #ifndef OF_HAVE_PIPE # import "OFStreamSocket.h" #endif #import "OFDate.h" #ifdef HAVE_KQUEUE # import "OFKernelEventObserver_kqueue.h" #endif #ifdef HAVE_EPOLL # import "OFKernelEventObserver_epoll.h" #endif | > > > | 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 | #import "OFArray.h" #import "OFStream.h" #import "OFStream+Private.h" #ifndef OF_HAVE_PIPE # import "OFStreamSocket.h" #endif #import "OFDate.h" #ifdef OF_HAVE_THREADS # import "OFMutex.h" #endif #ifdef HAVE_KQUEUE # import "OFKernelEventObserver_kqueue.h" #endif #ifdef HAVE_EPOLL # import "OFKernelEventObserver_epoll.h" #endif |
| ︙ | ︙ | |||
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 |
cancelAddrLen = sizeof(_cancelAddr);
if (of_getsockname(_cancelFD[0], (struct sockaddr*)&_cancelAddr,
&cancelAddrLen) != 0)
@throw [OFInitializationFailedException
exceptionWithClass: [self class]];
# endif
#endif
} @catch (id e) {
[self release];
@throw e;
}
return self;
}
- (void)dealloc
{
close(_cancelFD[0]);
if (_cancelFD[1] != _cancelFD[0])
close(_cancelFD[1]);
#ifdef OF_WII
of_socket_port_free(_cancelAddr.sin_port, SOCK_DGRAM);
#endif
[_readObjects release];
[_writeObjects release];
[super dealloc];
}
- (void)addObjectForReading: (id <OFReadyForReadingObserving>)object
{
OF_UNRECOGNIZED_SELECTOR
| > > > > > > > > | 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 |
cancelAddrLen = sizeof(_cancelAddr);
if (of_getsockname(_cancelFD[0], (struct sockaddr*)&_cancelAddr,
&cancelAddrLen) != 0)
@throw [OFInitializationFailedException
exceptionWithClass: [self class]];
# endif
#endif
#ifdef OF_HAVE_THREADS
_mutex = [[OFMutex alloc] init];
#endif
} @catch (id e) {
[self release];
@throw e;
}
return self;
}
- (void)dealloc
{
close(_cancelFD[0]);
if (_cancelFD[1] != _cancelFD[0])
close(_cancelFD[1]);
#ifdef OF_WII
of_socket_port_free(_cancelAddr.sin_port, SOCK_DGRAM);
#endif
[_readObjects release];
[_writeObjects release];
#ifdef OF_HAVE_THREADS
[_mutex release];
#endif
[super dealloc];
}
- (void)addObjectForReading: (id <OFReadyForReadingObserving>)object
{
OF_UNRECOGNIZED_SELECTOR
|
| ︙ | ︙ |