ObjFW  Diff

Differences From Artifact [b48920db5d]:

To Artifact [75625ed3ab]:


23
24
25
26
27
28
29
30
31
32



33
34

35
36
37
38
39
40
41
23
24
25
26
27
28
29



30
31
32
33

34
35
36
37
38
39
40
41







-
-
-
+
+
+

-
+







#import "OFCondition.h"
#import "OFSystemInfo.h"

#import "autorelease.h"

@interface OFThreadPoolJob: OFObject
{
	id target;
	SEL selector;
	id object;
	id _target;
	SEL _selector;
	id _object;
#ifdef OF_HAVE_BLOCKS
	of_thread_pool_block_t block;
	of_thread_pool_block_t _block;
#endif
}

+ (instancetype)jobWithTarget: (id)target
		     selector: (SEL)selector
		       object: (id)object;
#ifdef OF_HAVE_BLOCKS
64
65
66
67
68
69
70
71
72
73



74
75
76
77
78
79
80



81
82
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
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
64
65
66
67
68
69
70



71
72
73
74
75
76
77



78
79
80
81
82
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
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







-
-
-
+
+
+




-
-
-
+
+
+









-
+




-
+











-
-
+
+

-
+








-
-
+
+


-
-
+
+





-
-
+
+

-
-
+
+

















-
-
-
-
+
+
+
+










-
-
-
+
+
+








-
+







-
+



-
+




-
+


-
+

-
+




-
+



-
+

-
+


-
+






-
+







-
+

-
+




-
+

-
+

-
+







+ (instancetype)jobWithBlock: (of_thread_pool_block_t)block
{
	return [[(OFThreadPoolJob*)[self alloc]
	    initWithBlock: block] autorelease];
}
#endif

- initWithTarget: (id)target_
	selector: (SEL)selector_
	  object: (id)object_
- initWithTarget: (id)target
	selector: (SEL)selector
	  object: (id)object
{
	self = [super init];

	@try {
		target = [target_ retain];
		selector = selector_;
		object = [object_ retain];
		_target = [target retain];
		_selector = selector;
		_object = [object retain];
	} @catch (id e) {
		[self release];
		@throw e;
	}

	return self;
}

#ifdef OF_HAVE_BLOCKS
- initWithBlock: (of_thread_pool_block_t)block_
- initWithBlock: (of_thread_pool_block_t)block
{
	self = [super init];

	@try {
		block = [block_ copy];
		_block = [block copy];
	} @catch (id e) {
		[self release];
		@throw e;
	}

	return self;
}
#endif

- (void)dealloc
{
	[target release];
	[object release];
	[_target release];
	[_object release];
#ifdef OF_HAVE_BLOCKS
	[block release];
	[_block release];
#endif

	[super dealloc];
}

- (void)perform
{
#ifdef OF_HAVE_BLOCKS
	if (block != NULL)
		block();
	if (_block != NULL)
		_block();
	else
#endif
		[object performSelector: selector
			     withObject: object];
		[_target performSelector: _selector
			      withObject: _object];
}
@end

@interface OFThreadPoolThread: OFThread
{
	OFList *queue;
	OFCondition *queueCondition, *countCondition;
	OFList *_queue;
	OFCondition *_queueCondition, *_countCondition;
@public
	volatile BOOL terminate;
	volatile int *doneCount;
	volatile BOOL _terminate;
	volatile int *_doneCount;
}

+ (instancetype)threadWithThreadPool: (OFThreadPool*)threadPool;
- initWithThreadPool: (OFThreadPool*)threadPool;
@end

@implementation OFThreadPoolThread
+ (instancetype)threadWithThreadPool: (OFThreadPool*)threadPool
{
	return [[[self alloc] initWithThreadPool: threadPool] autorelease];
}

- initWithThreadPool: (OFThreadPool*)threadPool
{
	self = [super init];

	@try {
		queue = [threadPool->queue retain];
		queueCondition = [threadPool->queueCondition retain];
		countCondition = [threadPool->countCondition retain];
		doneCount = &threadPool->doneCount;
		_queue = [threadPool->_queue retain];
		_queueCondition = [threadPool->_queueCondition retain];
		_countCondition = [threadPool->_countCondition retain];
		_doneCount = &threadPool->_doneCount;
	} @catch (id e) {
		[self release];
		@throw e;
	}

	return self;
}

- (void)dealloc
{
	[queue release];
	[queueCondition release];
	[countCondition release];
	[_queue release];
	[_queueCondition release];
	[_countCondition release];

	[super dealloc];
}

- (id)main
{
	void *pool;

	if (terminate)
	if (_terminate)
		return nil;

	pool = objc_autoreleasePoolPush();

	for (;;) {
		OFThreadPoolJob *job;

		[queueCondition lock];
		[_queueCondition lock];
		@try {
			of_list_object_t *listObject;

			if (terminate) {
			if (_terminate) {
				objc_autoreleasePoolPop(pool);
				return nil;
			}

			listObject = [queue firstListObject];
			listObject = [_queue firstListObject];

			while (listObject == NULL) {
				[queueCondition wait];
				[_queueCondition wait];

				if (terminate) {
				if (_terminate) {
					objc_autoreleasePoolPop(pool);
					return nil;
				}

				listObject = [queue firstListObject];
				listObject = [_queue firstListObject];
			}

			job = [[listObject->object retain] autorelease];
			[queue removeListObject: listObject];
			[_queue removeListObject: listObject];
		} @finally {
			[queueCondition unlock];
			[_queueCondition unlock];
		}

		if (terminate) {
		if (_terminate) {
			objc_autoreleasePoolPop(pool);
			return nil;
		}

		[job perform];

		if (terminate) {
		if (_terminate) {
			objc_autoreleasePoolPop(pool);
			return nil;
		}

		objc_autoreleasePoolPop(pool);
		pool = objc_autoreleasePoolPush();

		[countCondition lock];
		[_countCondition lock];
		@try {
			if (terminate) {
			if (_terminate) {
				objc_autoreleasePoolPop(pool);
				return nil;
			}

			(*doneCount)++;
			(*_doneCount)++;

			[countCondition signal];
			[_countCondition signal];
		} @finally {
			[countCondition unlock];
			[_countCondition unlock];
		}
	}
}
@end

@implementation OFThreadPool
+ (instancetype)threadPool
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
340
341


342
343

344
345
346
347
348
349
350

351
352

353
354
355

356
357

358
359
360
361
362
363
364
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

340
341
342
343
344
345
346

347
348

349
350
351

352
353

354
355
356
357
358
359
360
361







-
+






-
-
-
-
-
+
+
+
+
+







-
+








-
-
+
+
-
-
-











-
+

-
+

-
+



-
+

-
+


-
+

-
+



-
-
-
-
+
+
+
+






-
-
-
+
+
+

-
+

-
-
+
+

-
+






-
+

-
+


-
+

-
+







}

- init
{
	return [self initWithSize: [OFSystemInfo numberOfCPUs]];
}

- initWithSize: (size_t)size_
- initWithSize: (size_t)size
{
	self = [super init];

	@try {
		size_t i;

		size = size_;
		threads = [[OFMutableArray alloc] init];
		queue = [[OFList alloc] init];
		queueCondition = [[OFCondition alloc] init];
		countCondition = [[OFCondition alloc] init];
		_size = size;
		_threads = [[OFMutableArray alloc] init];
		_queue = [[OFList alloc] init];
		_queueCondition = [[OFCondition alloc] init];
		_countCondition = [[OFCondition alloc] init];

		for (i = 0; i < size; i++) {
			void *pool = objc_autoreleasePoolPush();

			OFThreadPoolThread *thread =
			    [OFThreadPoolThread threadWithThreadPool: self];

			[threads addObject: thread];
			[_threads addObject: thread];

			objc_autoreleasePoolPop(pool);
		}

		/*
		 * We need to start the threads in a separate loop to make sure
		 * threads is not modified anymore to prevent a race condition.
		 */
		for (i = 0; i < size; i++) {
			OFThreadPoolThread *thread = [threads objectAtIndex: i];
		for (i = 0; i < size; i++)
			[[_threads objectAtIndex: i] start];

			[thread start];
		}
	} @catch (id e) {
		[self release];
		@throw e;
	}

	return self;
}

- (void)dealloc
{
	void *pool = objc_autoreleasePoolPush();
	[queueCondition lock];
	[_queueCondition lock];
	@try {
		[countCondition lock];
		[_countCondition lock];
		@try {
			OFEnumerator *enumerator = [threads objectEnumerator];
			OFEnumerator *enumerator = [_threads objectEnumerator];
			OFThreadPoolThread *thread;

			while ((thread = [enumerator nextObject]) != nil)
				thread->terminate = YES;
				thread->_terminate = YES;
		} @finally {
			[countCondition unlock];
			[_countCondition unlock];
		}

		[queueCondition broadcast];
		[_queueCondition broadcast];
	} @finally {
		[queueCondition unlock];
		[_queueCondition unlock];
	}
	objc_autoreleasePoolPop(pool);

	[threads release];
	[queue release];
	[queueCondition release];
	[countCondition release];
	[_threads release];
	[_queue release];
	[_queueCondition release];
	[_countCondition release];

	[super dealloc];
}

- (void)OF_dispatchJob: (OFThreadPoolJob*)job
{
	[countCondition lock];
	count++;
	[countCondition unlock];
	[_countCondition lock];
	_count++;
	[_countCondition unlock];

	[queueCondition lock];
	[_queueCondition lock];
	@try {
		[queue appendObject: job];
		[queueCondition signal];
		[_queue appendObject: job];
		[_queueCondition signal];
	} @finally {
		[queueCondition unlock];
		[_queueCondition unlock];
	}
}

- (void)waitUntilDone
{
	for (;;) {
		[countCondition lock];
		[_countCondition lock];
		@try {
			if (doneCount == count)
			if (_doneCount == _count)
				return;

			[countCondition wait];
			[_countCondition wait];
		} @finally {
			[countCondition unlock];
			[_countCondition unlock];
		}
	}
}

- (void)dispatchWithTarget: (id)target
		  selector: (SEL)selector
		    object: (id)object
373
374
375
376
377
378
379
380

381
382
370
371
372
373
374
375
376

377
378
379







-
+


{
	[self OF_dispatchJob: [OFThreadPoolJob jobWithBlock: block]];
}
#endif

- (size_t)size
{
	return size;
	return _size;
}
@end