Overview
Context
Changes
Modified src/Makefile
from [a4f5f66d7c]
to [d07ba32ec9].
︙ | | |
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
|
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
|
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
|
OFFileManager.m \
OFINICategory.m \
OFINIFile.m \
OFSettings.m \
OFZIPArchive.m \
OFZIPArchiveEntry.m
SRCS_PLUGINS = OFPlugin.m
SRCS_SOCKETS = OFHTTPClient.m \
OFHTTPRequest.m \
OFHTTPResponse.m \
OFHTTPServer.m \
OFKernelEventObserver.m \
OFStreamSocket.m \
OFTCPSocket.m \
OFUDPSocket.m \
resolver.m \
SRCS_SOCKETS = OFHTTPClient.m \
OFHTTPRequest.m \
OFHTTPResponse.m \
OFHTTPServer.m \
OFKernelEventObserver.m \
OFKernelEventObserver_LockedQueue.m \
OFStreamSocket.m \
OFTCPSocket.m \
OFUDPSocket.m \
resolver.m \
socket.m
SRCS_THREADS = OFCondition.m \
OFMutex.m \
OFRecursiveMutex.m \
OFThreadPool.m \
threading.m
|
︙ | | |
Modified src/OFKernelEventObserver+Private.h
from [2c8d4ea4a1]
to [ef9792ab10].
︙ | | |
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
|
15
16
17
18
19
20
21
22
23
24
25
|
-
-
-
-
-
|
*/
#import "OFKernelEventObserver.h"
OF_ASSUME_NONNULL_BEGIN
@interface OFKernelEventObserver ()
- (void)OF_addObjectForReading: (id)object;
- (void)OF_addObjectForWriting: (id)object;
- (void)OF_removeObjectForReading: (id)object;
- (void)OF_removeObjectForWriting: (id)object;
- (void)OF_processQueueAndStoreRemovedIn: (nullable OFMutableArray*)removed;
- (void)OF_processReadBuffers;
@end
OF_ASSUME_NONNULL_END
|
Modified src/OFKernelEventObserver.h
from [44498ce7a3]
to [4fe6de3289].
︙ | | |
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
|
17
18
19
20
21
22
23
24
25
26
27
28
29
30
|
-
-
-
-
-
|
#import "OFObject.h"
#import "socket.h"
OF_ASSUME_NONNULL_BEGIN
@class OFMutableArray OF_GENERIC(ObjectType);
@class OFMutableDictionary OF_GENERIC(KeyType, ObjectType);
@class OFDataArray;
#ifdef OF_HAVE_THREADS
@class OFMutex;
#endif
@class OFDate;
/*!
* @protocol OFKernelEventObserverDelegate
* OFKernelEventObserver.h ObjFW/OFKernelEventObserver.h
*
* @brief A protocol that needs to be implemented by delegates for
|
︙ | | |
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
|
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
|
-
-
-
-
-
|
*/
@interface OFKernelEventObserver: OFObject
{
OFMutableArray OF_GENERIC(id <OFReadyForReadingObserving>)
*_readObjects;
OFMutableArray OF_GENERIC(id <OFReadyForWritingObserving>)
*_writeObjects;
OFMutableArray *_queue;
OFDataArray *_queueActions;
id <OFKernelEventObserverDelegate> _delegate;
#ifdef OF_HAVE_PIPE
int _cancelFD[2];
#else
of_socket_t _cancelFD[2];
struct sockaddr_in _cancelAddr;
#endif
#ifdef OF_HAVE_THREADS
OFMutex *_mutex;
#endif
}
/*!
* The delegate for the OFKernelEventObserver.
*/
@property OF_NULLABLE_PROPERTY (assign)
id <OFKernelEventObserverDelegate> delegate;
|
︙ | | |
Modified src/OFKernelEventObserver.m
from [d6c5a9d524]
to [898e307ee4].
︙ | | |
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
|
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
|
-
-
-
-
-
-
-
|
* file.
*/
#define __NO_EXT_QNX
#include "config.h"
#include <assert.h>
#import "OFKernelEventObserver.h"
#import "OFKernelEventObserver+Private.h"
#import "OFArray.h"
#import "OFDictionary.h"
#import "OFStream.h"
#import "OFStream+Private.h"
#import "OFDataArray.h"
#ifndef OF_HAVE_PIPE
# import "OFStreamSocket.h"
#endif
#ifdef OF_HAVE_THREADS
# import "OFMutex.h"
#endif
#import "OFDate.h"
#ifdef HAVE_KQUEUE
# import "OFKernelEventObserver_kqueue.h"
#endif
#ifdef HAVE_EPOLL
# import "OFKernelEventObserver_epoll.h"
|
︙ | | |
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
|
44
45
46
47
48
49
50
51
52
53
54
55
56
57
|
-
-
-
-
-
-
-
-
|
#import "OFInitializationFailedException.h"
#import "OFInvalidArgumentException.h"
#import "OFOutOfRangeException.h"
#import "socket.h"
#import "socket_helpers.h"
enum {
QUEUE_ADD = 0,
QUEUE_REMOVE = 1,
QUEUE_READ = 0,
QUEUE_WRITE = 2
};
#define QUEUE_ACTION (QUEUE_ADD | QUEUE_REMOVE)
@implementation OFKernelEventObserver
@synthesize delegate = _delegate;
+ (void)initialize
{
if (self != [OFKernelEventObserver class])
return;
|
︙ | | |
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
|
91
92
93
94
95
96
97
98
99
100
101
102
103
104
|
-
-
-
|
@try {
#if !defined(OF_HAVE_PIPE) && !defined(OF_WII)
socklen_t cancelAddrLen;
#endif
_readObjects = [[OFMutableArray alloc] init];
_writeObjects = [[OFMutableArray alloc] init];
_queue = [[OFMutableArray alloc] init];
_queueActions = [[OFDataArray alloc]
initWithItemSize: sizeof(int)];
#ifdef OF_HAVE_PIPE
if (pipe(_cancelFD))
@throw [OFInitializationFailedException
exceptionWithClass: [self class]];
#else
_cancelFD[0] = _cancelFD[1] = socket(AF_INET, SOCK_DGRAM, 0);
|
︙ | | |
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
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
199
200
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
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
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
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
|
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
168
169
170
171
172
173
174
175
176
177
178
179
180
181
|
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
|
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];
[_queue release];
[_queueActions release];
#ifdef OF_HAVE_THREADS
[_mutex release];
#endif
[super dealloc];
}
- (void)addObjectForReading: (id <OFReadyForReadingObserving>)object
{
#ifdef OF_HAVE_THREADS
[_mutex lock];
#endif
@try {
int qi = QUEUE_ADD | QUEUE_READ;
OF_UNRECOGNIZED_SELECTOR
[_queue addObject: object];
[_queueActions addItem: &qi];
} @finally {
#ifdef OF_HAVE_THREADS
[_mutex unlock];
#endif
}
}
[self cancel];
}
- (void)addObjectForWriting: (id <OFReadyForWritingObserving>)object
{
#ifdef OF_HAVE_THREADS
[_mutex lock];
#endif
@try {
int qi = QUEUE_ADD | QUEUE_WRITE;
OF_UNRECOGNIZED_SELECTOR
[_queue addObject: object];
[_queueActions addItem: &qi];
} @finally {
#ifdef OF_HAVE_THREADS
[_mutex unlock];
#endif
}
}
[self cancel];
}
- (void)removeObjectForReading: (id <OFReadyForReadingObserving>)object
{
#ifdef OF_HAVE_THREADS
[_mutex lock];
#endif
@try {
int qi = QUEUE_REMOVE | QUEUE_READ;
OF_UNRECOGNIZED_SELECTOR
[_queue addObject: object];
[_queueActions addItem: &qi];
} @finally {
#ifdef OF_HAVE_THREADS
[_mutex unlock];
#endif
}
[self cancel];
}
- (void)removeObjectForWriting: (id <OFReadyForWritingObserving>)object
{
#ifdef OF_HAVE_THREADS
[_mutex lock];
#endif
@try {
int qi = QUEUE_REMOVE | QUEUE_WRITE;
[_queue addObject: object];
[_queueActions addItem: &qi];
} @finally {
#ifdef OF_HAVE_THREADS
[_mutex unlock];
#endif
}
[self cancel];
}
- (void)OF_addObjectForReading: (id)object
{
OF_UNRECOGNIZED_SELECTOR
}
- (void)OF_addObjectForWriting: (id)object
{
OF_UNRECOGNIZED_SELECTOR
}
- (void)OF_removeObjectForReading: (id)object
{
OF_UNRECOGNIZED_SELECTOR
}
- (void)OF_removeObjectForWriting: (id)object
{
OF_UNRECOGNIZED_SELECTOR
}
- (void)OF_processQueueAndStoreRemovedIn: (OFMutableArray*)removed
{
#ifdef OF_HAVE_THREADS
[_mutex lock];
#endif
@try {
id const *queueObjects = [_queue objects];
int *queueActionItems = [_queueActions items];
size_t i, count = [_queue count];
for (i = 0; i < count; i++) {
id object = queueObjects[i];
int action = queueActionItems[i];
switch (action) {
case QUEUE_ADD | QUEUE_READ:
[_readObjects addObject: object];
[self OF_addObjectForReading: object];
break;
case QUEUE_ADD | QUEUE_WRITE:
[_writeObjects addObject: object];
[self OF_addObjectForWriting: object];
break;
case QUEUE_REMOVE | QUEUE_READ:
[self OF_removeObjectForReading: object];
[removed addObject: object];
[_readObjects removeObjectIdenticalTo: object];
break;
case QUEUE_REMOVE | QUEUE_WRITE:
[self OF_removeObjectForWriting: object];
[removed addObject: object];
[_writeObjects removeObjectIdenticalTo: object];
break;
default:
assert(0);
}
}
[_queue removeAllObjects];
[_queueActions removeAllItems];
} @finally {
#ifdef OF_HAVE_THREADS
[_mutex unlock];
#endif
}
}
- (void)observe
{
[self observeForTimeInterval: -1];
}
|
︙ | | |
Added src/OFKernelEventObserver_LockedQueue.h version [e60316af1b].
|
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
|
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
|
/*
* Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015
* Jonathan Schleifer <js@webkeks.org>
*
* 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.
*
* Alternatively, it may be distributed under the terms of the GNU General
* Public License, either version 2 or 3, which can be found in the file
* LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this
* file.
*/
#import "OFKernelEventObserver.h"
OF_ASSUME_NONNULL_BEGIN
@class OFMutableArray OF_GENERIC(ObjectType);
@class OFDataArray;
#ifdef OF_HAVE_THREADS
@class OFMutex;
#endif
@interface OFKernelEventObserver_LockedQueue: OFKernelEventObserver
{
OFDataArray *_queueActions, *_queueFDs;
OFMutableArray *_queueObjects;
#ifdef OF_HAVE_THREADS
OFMutex *_mutex;
#endif
}
- (void)OF_addObjectForReading: (id)object
fileDescriptor: (int)fd;
- (void)OF_addObjectForWriting: (id)object
fileDescriptor: (int)fd;
- (void)OF_removeObjectForReading: (id)object
fileDescriptor: (int)fd;
- (void)OF_removeObjectForWriting: (id)object
fileDescriptor: (int)fd;
- (void)OF_processQueue;
@end
OF_ASSUME_NONNULL_END
|
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
Added src/OFKernelEventObserver_LockedQueue.m version [dc0778aa90].