Differences From Artifact [8a78192e7d]:
- File src/OFThreadPool.m — part of check-in [ddcfab2b93] at 2012-07-20 14:17:30 on branch trunk — Blocks need to be copied, not retained. (user: js, size: 7010) [annotate] [blame] [check-ins using]
To Artifact [46f0aec229]:
- File
src/OFThreadPool.m
— part of check-in
[1255f3a11a]
at
2012-08-10 20:08:24
on branch trunk
— Directly use the runtime's autorelease pools.
This greatly improves performance, as it gets rid of the overhead of
OFAutoreleasePool. (user: js, size: 7059) [annotate] [blame] [check-ins using]
︙ | ︙ | |||
16 17 18 19 20 21 22 | #include "config.h" #import "OFThreadPool.h" #import "OFArray.h" #import "OFList.h" #import "OFThread.h" | > | | 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 | #include "config.h" #import "OFThreadPool.h" #import "OFArray.h" #import "OFList.h" #import "OFThread.h" #import "autorelease.h" @interface OFThreadPoolJob: OFObject { id target; SEL selector; id object; #ifdef OF_HAVE_BLOCKS |
︙ | ︙ | |||
171 172 173 174 175 176 177 | [countCondition release]; [super dealloc]; } - (id)main { | | | < | > | | | | | > | | 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 | [countCondition release]; [super dealloc]; } - (id)main { void *pool; if (terminate) return nil; pool = objc_autoreleasePoolPush(); for (;;) { OFThreadPoolJob *job; [queueCondition lock]; @try { of_list_object_t *listObject; if (terminate) { objc_autoreleasePoolPop(pool); return nil; } listObject = [queue firstListObject]; while (listObject == NULL) { [queueCondition wait]; if (terminate) { objc_autoreleasePoolPop(pool); return nil; } listObject = [queue firstListObject]; } job = [[listObject->object retain] autorelease]; [queue removeListObject: listObject]; } @finally { [queueCondition unlock]; } if (terminate) { objc_autoreleasePoolPop(pool); return nil; } [job perform]; if (terminate) { objc_autoreleasePoolPop(pool); return nil; } objc_autoreleasePoolPop(pool); pool = objc_autoreleasePoolPush(); [countCondition lock]; @try { if (terminate) { objc_autoreleasePoolPop(pool); return nil; } (*doneCount)++; [countCondition signal]; } @finally { |
︙ | ︙ | |||
261 262 263 264 265 266 267 | } - initWithSize: (size_t)size_ { self = [super init]; @try { | < > > | < < | | | 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 | } - 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]; for (i = 0; i < size; i++) { void *pool = objc_autoreleasePoolPush(); OFThreadPoolThread *thread = [OFThreadPoolThread threadWithThreadPool: self]; [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]; [thread start]; } } @catch (id e) { [self release]; @throw e; } return self; } - (void)dealloc { void *pool = objc_autoreleasePoolPush(); [queueCondition lock]; @try { [countCondition lock]; @try { OFEnumerator *enumerator = [threads objectEnumerator]; OFThreadPoolThread *thread; while ((thread = [enumerator nextObject]) != nil) thread->terminate = YES; } @finally { [countCondition unlock]; } [queueCondition broadcast]; } @finally { [queueCondition unlock]; } objc_autoreleasePoolPop(pool); [threads release]; [queue release]; [queueCondition release]; [countCondition release]; [super dealloc]; |
︙ | ︙ |