blender
/
blender
132
398
Fork 577
Code Issues 6.2k Pull Requests 747 Projects 19 Wiki Activity

Fix T50886: Blender crashes on render 

Was a mistake in one of the previous TLS commits.

See comment in the pool_create to see some details why it was crashing.
This commit is contained in:
Sergey Sharybin 2017-03-08 09:41:38 +01:00
parent 3505be8361
commit a095611eb8
Notes: blender-bot 2023-02-14 07:09:36 +01:00 
Referenced by issue #50886, Latest Blender from master/buildbot Crash with many of my scenes (Cycles)
1 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
source/blender/blenlib/intern/task.c
View File

@ -55,15 +55,20 @@
#define LOCALQUEUE_SIZE 1
#ifndef NDEBUG
# define ASSERT_THREAD_ID(scheduler, thread_id) \
do { \
if (!BLI_thread_is_main()) { \
TaskThread *thread = pthread_getspecific(scheduler->tls_id_key); \
BLI_assert(thread_id == thread->id); \
} \
else { \
BLI_assert(thread_id == 0); \
} \
# define ASSERT_THREAD_ID(scheduler, thread_id) \
do { \
if (!BLI_thread_is_main()) { \
TaskThread *thread = pthread_getspecific(scheduler->tls_id_key); \
if (thread == NULL) { \
BLI_assert(thread_id == 0); \
} \
else { \
BLI_assert(thread_id == thread->id); \
} \
} \
else { \
BLI_assert(thread_id == 0); \
} \
} while (false)
#else
# define ASSERT_THREAD_ID(scheduler, thread_id)
@ -579,7 +584,17 @@ static TaskPool *task_pool_create_ex(TaskScheduler *scheduler,
}
else {
TaskThread *thread = pthread_getspecific(scheduler->tls_id_key);
pool->thread_id = thread->id;
/* NOTE: It is possible that pool is created from non-main thread
* which isn't a scheduler thread. In this case pthread's TLS will
* be NULL and we can safely consider thread id 0 for the main
* thread of this pool (the one which does wort_and_wait()).
*/
if (thread == NULL) {
pool->thread_id = 0;
}
else {
pool->thread_id = thread->id;
}
}
#ifdef DEBUG_STATS