Overview
Context
Changes
Modified src/OFKernelEventObserver+Private.h
from [b8cff57a1b]
to [eb360b3361].
︙ | | |
15
16
17
18
19
20
21
22
23
24
25
|
15
16
17
18
19
20
21
22
23
24
25
|
-
+
|
*/
#import "OFKernelEventObserver.h"
OF_ASSUME_NONNULL_BEGIN
@interface OFKernelEventObserver ()
- (void)OF_processReadBuffers;
- (bool)OF_processReadBuffers;
@end
OF_ASSUME_NONNULL_END
|
Modified src/OFKernelEventObserver.m
from [5d44afb3d5]
to [1613a72d1b].
︙ | | |
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
|
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
|
-
+
+
+
-
-
-
-
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
|
# else
OF_ENSURE(sendto(_cancelFD[1], "", 1, 0,
(struct sockaddr*)&_cancelAddr, 8) > 0);
# endif
#endif
}
- (void)OF_processReadBuffers
- (bool)OF_processReadBuffers
{
bool foundInReadBuffer = false;
for (id object in _readObjects) {
void *pool = objc_autoreleasePoolPush();
if ([object isKindOfClass: [OFStream class]] &&
[object hasDataInReadBuffer] &&
![object OF_isWaitingForDelimiter] &&
[_delegate respondsToSelector:
@selector(objectIsReadyForReading:)])
[_delegate objectIsReadyForReading: object];
![object OF_isWaitingForDelimiter]) {
if ([_delegate respondsToSelector:
@selector(objectIsReadyForReading:)])
[_delegate objectIsReadyForReading: object];
foundInReadBuffer = true;
}
objc_autoreleasePoolPop(pool);
}
}
/*
* As long as we have data in the read buffer for any stream, we don't
* want to block.
*/
return foundInReadBuffer;
}
@end
|
Modified src/OFKernelEventObserver_LockedQueue.m
from [06cbc8baae]
to [1dd69e1924].
︙ | | |
166
167
168
169
170
171
172
173
174
175
176
177
178
179
|
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
|
+
+
|
fileDescriptor: (int)fd
{
OF_UNRECOGNIZED_SELECTOR
}
- (void)OF_processQueue
{
void *pool = objc_autoreleasePoolPush();
#ifdef OF_HAVE_THREADS
[_mutex lock];
@try {
#endif
int *queueActions = [_queueActions items];
int *queueFDs = [_queueFDs items];
id const *queueObjects = [_queueObjects objects];
|
︙ | | |
225
226
227
228
229
230
231
232
233
|
227
228
229
230
231
232
233
234
235
236
237
|
-
+
+
+
|
[_queueFDs removeAllItems];
[_queueObjects removeAllObjects];
#ifdef OF_HAVE_THREADS
} @finally {
[_mutex unlock];
}
#endif
}
objc_autoreleasePoolPop(pool);
}
@end
|
Modified src/OFKernelEventObserver_epoll.m
from [dd16d51752]
to [ccbb902e19].
︙ | | |
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
|
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
|
-
-
-
+
+
-
|
events: EPOLLOUT
objectsArray: _writeObjects];
}
- (void)observeForTimeInterval: (of_time_interval_t)timeInterval
{
OFNull *nullObject = [OFNull null];
void *pool = objc_autoreleasePoolPush();
struct epoll_event eventList[EVENTLIST_SIZE];
int events;
[self OF_processReadBuffers];
if ([self OF_processReadBuffers])
return;
objc_autoreleasePoolPop(pool);
events = epoll_wait(_epfd, eventList, EVENTLIST_SIZE,
(timeInterval != -1 ? timeInterval * 1000 : -1));
if (events < 0)
@throw [OFObserveFailedException exceptionWithObserver: self
errNo: errno];
|
︙ | | |
Modified src/OFKernelEventObserver_kqueue.m
from [6945083a36]
to [240d5f78f9].
︙ | | |
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
|
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
|
-
+
+
+
-
-
-
-
+
+
|
[_mutex unlock];
}
#endif
}
- (void)observeForTimeInterval: (of_time_interval_t)timeInterval
{
void *pool = objc_autoreleasePoolPush();
struct timespec timeout;
struct kevent eventList[EVENTLIST_SIZE];
int events;
if ([self OF_processReadBuffers])
return;
timeout.tv_sec = (time_t)timeInterval;
timeout.tv_nsec = lrint((timeInterval - timeout.tv_sec) * 1000000000);
[self OF_processReadBuffers];
objc_autoreleasePoolPop(pool);
events = kevent(_kernelQueue, NULL, 0, eventList, EVENTLIST_SIZE,
(timeInterval != -1 ? &timeout : NULL));
if (events < 0)
@throw [OFObserveFailedException exceptionWithObserver: self
errNo: errno];
for (int i = 0; i < events; i++) {
void *pool;
if (eventList[i].flags & EV_ERROR)
@throw [OFObserveFailedException
exceptionWithObserver: self
errNo: (int)eventList[i].data];
if (eventList[i].ident == _cancelFD[0]) {
char buffer;
|
︙ | | |
Modified src/OFKernelEventObserver_poll.m
from [bb3d801549]
to [365c8917fd].
︙ | | |
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
197
|
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
197
198
|
-
+
-
-
+
+
-
+
+
|
[self OF_removeObject: object
fileDescriptor: fd
events: POLLOUT];
}
- (void)observeForTimeInterval: (of_time_interval_t)timeInterval
{
void *pool = objc_autoreleasePoolPush();
struct pollfd *FDs;
int events;
size_t nFDs;
[self OF_processQueue];
[self OF_processReadBuffers];
if ([self OF_processReadBuffers])
return;
objc_autoreleasePoolPop(pool);
FDs = [_FDs items];
nFDs = [_FDs count];
#ifdef OPEN_MAX
if (nFDs > OPEN_MAX)
@throw [OFOutOfRangeException exception];
#endif
events = poll(FDs, (nfds_t)nFDs,
(int)(timeInterval != -1 ? timeInterval * 1000 : -1));
if (events < 0)
@throw [OFObserveFailedException exceptionWithObserver: self
errNo: errno];
for (size_t i = 0; i < nFDs; i++) {
assert(FDs[i].fd <= _maxFD);
if (FDs[i].revents & POLLIN) {
void *pool;
if (FDs[i].fd == _cancelFD[0]) {
char buffer;
#ifdef OF_HAVE_PIPE
OF_ENSURE(read(_cancelFD[0], &buffer, 1) == 1);
#else
OF_ENSURE(recvfrom(_cancelFD[0], &buffer, 1,
|
︙ | | |
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
|
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
|
-
+
|
[_delegate objectIsReadyForReading:
_FDToObject[FDs[i].fd]];
objc_autoreleasePoolPop(pool);
}
if (FDs[i].revents & POLLOUT) {
pool = objc_autoreleasePoolPush();
void *pool = objc_autoreleasePoolPush();
if ([_delegate respondsToSelector:
@selector(objectIsReadyForWriting:)])
[_delegate objectIsReadyForWriting:
_FDToObject[FDs[i].fd]];
objc_autoreleasePoolPop(pool);
}
FDs[i].revents = 0;
}
}
@end
|
Modified src/OFKernelEventObserver_select.m
from [1968f741af]
to [c7ee699c53].
︙ | | |
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
|
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
|
-
+
-
-
+
+
-
|
#endif
FD_CLR(fd, &_writeFDs);
}
- (void)observeForTimeInterval: (of_time_interval_t)timeInterval
{
void *pool = objc_autoreleasePoolPush();
id const *objects;
fd_set readFDs;
fd_set writeFDs;
struct timeval timeout;
int events;
size_t count;
[self OF_processQueue];
[self OF_processReadBuffers];
if ([self OF_processReadBuffers])
return;
objc_autoreleasePoolPop(pool);
#ifdef FD_COPY
FD_COPY(&_readFDs, &readFDs);
FD_COPY(&_writeFDs, &writeFDs);
#else
readFDs = _readFDs;
writeFDs = _writeFDs;
|
︙ | | |
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
217
218
219
|
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
|
-
-
-
-
+
+
-
-
-
-
+
+
|
#endif
}
objects = [_readObjects objects];
count = [_readObjects count];
for (size_t i = 0; i < count; i++) {
int fd;
pool = objc_autoreleasePoolPush();
fd = [objects[i] fileDescriptorForReading];
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 (size_t i = 0; i < count; i++) {
int fd;
pool = objc_autoreleasePoolPush();
fd = [objects[i] fileDescriptorForWriting];
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
|