Differences From Artifact [2f9aa72b9d]:
- File src/OFThread.m — part of check-in [76ee8ab481] at 2017-10-07 14:57:14 on branch trunk — OFThread: Support setting the name while running (user: js, size: 9152) [annotate] [blame] [check-ins using]
To Artifact [41a9132f9a]:
- File
src/OFThread.m
— part of check-in
[c211f691e7]
at
2017-10-07 15:12:51
on branch trunk
— OFThread: Fix setting the name on the wrong thread
This time for real. (user: js, size: 9190) [annotate] [blame] [check-ins using]
︙ | |||
94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 | 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 | + + + + + + + + | static of_tlskey_t threadSelfKey; static OFThread *mainThread; static void callMain(id object) { OFThread *thread = (OFThread *)object; OFString *name; if (!of_tlskey_set(threadSelfKey, thread)) @throw [OFInitializationFailedException exceptionWithClass: [thread class]]; thread->_pool = objc_autoreleasePoolPush(); name = [thread name]; if (name != nil) of_thread_set_name( [name cStringWithEncoding: [OFLocalization encoding]]); else of_thread_set_name(object_getClassName(thread)); /* * Nasty workaround for thread implementations which can't return a * pointer on join. */ # ifdef OF_HAVE_BLOCKS if (thread->_threadBlock != NULL) thread->_returnValue = [thread->_threadBlock() retain]; |
︙ | |||
363 364 365 366 367 368 369 | 371 372 373 374 375 376 377 378 379 380 381 382 383 384 | - - - - - - | _running = OF_THREAD_RUNNING; if (!of_thread_new(&_thread, callMain, self, &_attr)) { [self release]; @throw [OFThreadStartFailedException exceptionWithThread: self]; } |
︙ |