Overview
| Comment: | OFKernelEventObserver: Fix read buffers, select() |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
23ff70bec45d6e926675dfde22ff2e63 |
| User & Date: | js on 2020-01-07 22:59:41 |
| Other Links: | manifest | tags |
Context
|
2020-01-12
| ||
| 16:22 | Cancel async requests in OFStreamSocket instead check-in: cea3f2133d user: js tags: trunk | |
|
2020-01-08
| ||
| 02:29 | Merge branch 'master' into 1.0 check-in: e7e1e1c6c5 user: js tags: 1.0 | |
|
2020-01-07
| ||
| 22:59 | OFKernelEventObserver: Fix read buffers, select() check-in: 23ff70bec4 user: js tags: trunk | |
| 20:36 | OFStream: Always cancel async requests on close check-in: 321fa12f9a user: js tags: trunk | |
Changes
Modified src/OFEpollKernelEventObserver.m from [3f87d51ce3] to [8fc6ef4b31].
| ︙ | ︙ | |||
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 |
}
- (void)addObjectForReading: (id <OFReadyForReadingObserving>)object
{
[self of_addObject: object
fileDescriptor: object.fileDescriptorForReading
events: EPOLLIN];
}
- (void)addObjectForWriting: (id <OFReadyForWritingObserving>)object
{
[self of_addObject: object
fileDescriptor: object.fileDescriptorForWriting
events: EPOLLOUT];
}
- (void)removeObjectForReading: (id <OFReadyForReadingObserving>)object
{
[self of_removeObject: object
fileDescriptor: object.fileDescriptorForReading
events: EPOLLIN];
}
- (void)removeObjectForWriting: (id <OFReadyForWritingObserving>)object
{
[self of_removeObject: object
fileDescriptor: object.fileDescriptorForWriting
events: EPOLLOUT];
}
- (void)observeForTimeInterval: (of_time_interval_t)timeInterval
{
OFNull *nullObject = [OFNull null];
struct epoll_event eventList[EVENTLIST_SIZE];
int events;
| > > > > > > > > | 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 |
}
- (void)addObjectForReading: (id <OFReadyForReadingObserving>)object
{
[self of_addObject: object
fileDescriptor: object.fileDescriptorForReading
events: EPOLLIN];
[super addObjectForReading: object];
}
- (void)addObjectForWriting: (id <OFReadyForWritingObserving>)object
{
[self of_addObject: object
fileDescriptor: object.fileDescriptorForWriting
events: EPOLLOUT];
[super addObjectForWriting: object];
}
- (void)removeObjectForReading: (id <OFReadyForReadingObserving>)object
{
[self of_removeObject: object
fileDescriptor: object.fileDescriptorForReading
events: EPOLLIN];
[super removeObjectForReading: object];
}
- (void)removeObjectForWriting: (id <OFReadyForWritingObserving>)object
{
[self of_removeObject: object
fileDescriptor: object.fileDescriptorForWriting
events: EPOLLOUT];
[super removeObjectForWriting: object];
}
- (void)observeForTimeInterval: (of_time_interval_t)timeInterval
{
OFNull *nullObject = [OFNull null];
struct epoll_event eventList[EVENTLIST_SIZE];
int events;
|
| ︙ | ︙ |
Modified src/OFKernelEventObserver.m from [6cc4e842a3] to [2c737f6572].
| ︙ | ︙ | |||
190 191 192 193 194 195 196 |
[_writeObjects release];
[super dealloc];
}
- (void)addObjectForReading: (id <OFReadyForReadingObserving>)object
{
| | | | | | 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 |
[_writeObjects release];
[super dealloc];
}
- (void)addObjectForReading: (id <OFReadyForReadingObserving>)object
{
[_readObjects addObject: object];
}
- (void)addObjectForWriting: (id <OFReadyForWritingObserving>)object
{
[_writeObjects addObject: object];
}
- (void)removeObjectForReading: (id <OFReadyForReadingObserving>)object
{
[_readObjects removeObjectIdenticalTo: object];
}
- (void)removeObjectForWriting: (id <OFReadyForWritingObserving>)object
{
[_writeObjects removeObjectIdenticalTo: object];
}
- (bool)of_processReadBuffers
{
bool foundInReadBuffer = false;
for (id object in _readObjects) {
|
| ︙ | ︙ |
Modified src/OFKqueueKernelEventObserver.m from [e2ae904e52] to [9821cf501a].
| ︙ | ︙ | |||
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 |
#else
event.udata = (intptr_t)object;
#endif
if (kevent(_kernelQueue, &event, 1, NULL, 0, NULL) != 0)
@throw [OFObserveFailedException exceptionWithObserver: self
errNo: errno];
}
- (void)addObjectForWriting: (id <OFReadyForWritingObserving>)object
{
struct kevent event;
memset(&event, 0, sizeof(event));
event.ident = object.fileDescriptorForWriting;
event.filter = EVFILT_WRITE;
event.flags = EV_ADD;
#ifndef OF_NETBSD
event.udata = object;
#else
event.udata = (intptr_t)object;
#endif
if (kevent(_kernelQueue, &event, 1, NULL, 0, NULL) != 0)
@throw [OFObserveFailedException exceptionWithObserver: self
errNo: errno];
}
- (void)removeObjectForReading: (id <OFReadyForReadingObserving>)object
{
struct kevent event;
memset(&event, 0, sizeof(event));
event.ident = object.fileDescriptorForReading;
event.filter = EVFILT_READ;
event.flags = EV_DELETE;
if (kevent(_kernelQueue, &event, 1, NULL, 0, NULL) != 0)
@throw [OFObserveFailedException exceptionWithObserver: self
errNo: errno];
}
- (void)removeObjectForWriting: (id <OFReadyForWritingObserving>)object
{
struct kevent event;
memset(&event, 0, sizeof(event));
event.ident = object.fileDescriptorForWriting;
event.filter = EVFILT_WRITE;
event.flags = EV_DELETE;
if (kevent(_kernelQueue, &event, 1, NULL, 0, NULL) != 0)
@throw [OFObserveFailedException exceptionWithObserver: self
errNo: errno];
}
- (void)observeForTimeInterval: (of_time_interval_t)timeInterval
{
struct timespec timeout;
struct kevent eventList[EVENTLIST_SIZE];
int events;
| > > > > > > > > | 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 155 156 157 158 159 160 161 162 |
#else
event.udata = (intptr_t)object;
#endif
if (kevent(_kernelQueue, &event, 1, NULL, 0, NULL) != 0)
@throw [OFObserveFailedException exceptionWithObserver: self
errNo: errno];
[super addObjectForReading: object];
}
- (void)addObjectForWriting: (id <OFReadyForWritingObserving>)object
{
struct kevent event;
memset(&event, 0, sizeof(event));
event.ident = object.fileDescriptorForWriting;
event.filter = EVFILT_WRITE;
event.flags = EV_ADD;
#ifndef OF_NETBSD
event.udata = object;
#else
event.udata = (intptr_t)object;
#endif
if (kevent(_kernelQueue, &event, 1, NULL, 0, NULL) != 0)
@throw [OFObserveFailedException exceptionWithObserver: self
errNo: errno];
[super addObjectForWriting: object];
}
- (void)removeObjectForReading: (id <OFReadyForReadingObserving>)object
{
struct kevent event;
memset(&event, 0, sizeof(event));
event.ident = object.fileDescriptorForReading;
event.filter = EVFILT_READ;
event.flags = EV_DELETE;
if (kevent(_kernelQueue, &event, 1, NULL, 0, NULL) != 0)
@throw [OFObserveFailedException exceptionWithObserver: self
errNo: errno];
[super removeObjectForReading: object];
}
- (void)removeObjectForWriting: (id <OFReadyForWritingObserving>)object
{
struct kevent event;
memset(&event, 0, sizeof(event));
event.ident = object.fileDescriptorForWriting;
event.filter = EVFILT_WRITE;
event.flags = EV_DELETE;
if (kevent(_kernelQueue, &event, 1, NULL, 0, NULL) != 0)
@throw [OFObserveFailedException exceptionWithObserver: self
errNo: errno];
[super removeObjectForWriting: object];
}
- (void)observeForTimeInterval: (of_time_interval_t)timeInterval
{
struct timespec timeout;
struct kevent eventList[EVENTLIST_SIZE];
int events;
|
| ︙ | ︙ |
Modified src/OFPollKernelEventObserver.m from [899a665da2] to [22bca879fa].
| ︙ | ︙ | |||
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 |
}
- (void)addObjectForReading: (id <OFReadyForReadingObserving>)object
{
[self of_addObject: object
fileDescriptor: object.fileDescriptorForReading
events: POLLIN];
}
- (void)addObjectForWriting: (id <OFReadyForWritingObserving>)object
{
[self of_addObject: object
fileDescriptor: object.fileDescriptorForWriting
events: POLLOUT];
}
- (void)removeObjectForReading: (id <OFReadyForReadingObserving>)object
{
[self of_removeObject: object
fileDescriptor: object.fileDescriptorForReading
events: POLLIN];
}
- (void)removeObjectForWriting: (id <OFReadyForWritingObserving>)object
{
[self of_removeObject: object
fileDescriptor: object.fileDescriptorForWriting
events: POLLOUT];
}
- (void)observeForTimeInterval: (of_time_interval_t)timeInterval
{
struct pollfd *FDs;
int events;
size_t nFDs;
| > > > > > > > > | 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 |
}
- (void)addObjectForReading: (id <OFReadyForReadingObserving>)object
{
[self of_addObject: object
fileDescriptor: object.fileDescriptorForReading
events: POLLIN];
[super addObjectForReading: object];
}
- (void)addObjectForWriting: (id <OFReadyForWritingObserving>)object
{
[self of_addObject: object
fileDescriptor: object.fileDescriptorForWriting
events: POLLOUT];
[super addObjectForWriting: object];
}
- (void)removeObjectForReading: (id <OFReadyForReadingObserving>)object
{
[self of_removeObject: object
fileDescriptor: object.fileDescriptorForReading
events: POLLIN];
[super removeObjectForReading: object];
}
- (void)removeObjectForWriting: (id <OFReadyForWritingObserving>)object
{
[self of_removeObject: object
fileDescriptor: object.fileDescriptorForWriting
events: POLLOUT];
[super removeObjectForWriting: object];
}
- (void)observeForTimeInterval: (of_time_interval_t)timeInterval
{
struct pollfd *FDs;
int events;
size_t nFDs;
|
| ︙ | ︙ |
Modified src/OFSelectKernelEventObserver.m from [2d6e268dc3] to [002aab58fd].
| ︙ | ︙ | |||
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 |
@throw [OFOutOfRangeException exception];
#endif
if (fd > _maxFD)
_maxFD = fd;
FD_SET((of_socket_t)fd, &_readFDs);
}
- (void)addObjectForWriting: (id <OFReadyForWritingObserving>)object
{
int fd = object.fileDescriptorForWriting;
if (fd < 0 || fd > INT_MAX - 1)
@throw [OFOutOfRangeException exception];
#ifndef OF_WINDOWS
if (fd >= (int)FD_SETSIZE)
@throw [OFOutOfRangeException exception];
#endif
if (fd > _maxFD)
_maxFD = fd;
FD_SET((of_socket_t)fd, &_writeFDs);
}
- (void)removeObjectForReading: (id <OFReadyForReadingObserving>)object
{
/* TODO: Adjust _maxFD */
int fd = object.fileDescriptorForReading;
if (fd < 0)
@throw [OFOutOfRangeException exception];
#ifndef OF_WINDOWS
if (fd >= (int)FD_SETSIZE)
@throw [OFOutOfRangeException exception];
#endif
FD_CLR((of_socket_t)fd, &_readFDs);
}
- (void)removeObjectForWriting: (id <OFReadyForWritingObserving>)object
{
/* TODO: Adjust _maxFD */
int fd = object.fileDescriptorForWriting;
if (fd < 0)
@throw [OFOutOfRangeException exception];
#ifndef OF_WINDOWS
if (fd >= (int)FD_SETSIZE)
@throw [OFOutOfRangeException exception];
#endif
FD_CLR((of_socket_t)fd, &_writeFDs);
}
- (void)observeForTimeInterval: (of_time_interval_t)timeInterval
{
id const *objects;
fd_set readFDs;
fd_set writeFDs;
| > > > > > > > > | 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 155 156 |
@throw [OFOutOfRangeException exception];
#endif
if (fd > _maxFD)
_maxFD = fd;
FD_SET((of_socket_t)fd, &_readFDs);
[super addObjectForReading: object];
}
- (void)addObjectForWriting: (id <OFReadyForWritingObserving>)object
{
int fd = object.fileDescriptorForWriting;
if (fd < 0 || fd > INT_MAX - 1)
@throw [OFOutOfRangeException exception];
#ifndef OF_WINDOWS
if (fd >= (int)FD_SETSIZE)
@throw [OFOutOfRangeException exception];
#endif
if (fd > _maxFD)
_maxFD = fd;
FD_SET((of_socket_t)fd, &_writeFDs);
[super addObjectForWriting: object];
}
- (void)removeObjectForReading: (id <OFReadyForReadingObserving>)object
{
/* TODO: Adjust _maxFD */
int fd = object.fileDescriptorForReading;
if (fd < 0)
@throw [OFOutOfRangeException exception];
#ifndef OF_WINDOWS
if (fd >= (int)FD_SETSIZE)
@throw [OFOutOfRangeException exception];
#endif
FD_CLR((of_socket_t)fd, &_readFDs);
[super removeObjectForReading: object];
}
- (void)removeObjectForWriting: (id <OFReadyForWritingObserving>)object
{
/* TODO: Adjust _maxFD */
int fd = object.fileDescriptorForWriting;
if (fd < 0)
@throw [OFOutOfRangeException exception];
#ifndef OF_WINDOWS
if (fd >= (int)FD_SETSIZE)
@throw [OFOutOfRangeException exception];
#endif
FD_CLR((of_socket_t)fd, &_writeFDs);
[super removeObjectForWriting: object];
}
- (void)observeForTimeInterval: (of_time_interval_t)timeInterval
{
id const *objects;
fd_set readFDs;
fd_set writeFDs;
|
| ︙ | ︙ |