archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Task scheduler: Remove query for the pool's number of threads

Browse Source 
Not really happy of per-pool threads limit, need to find better
approach to that. But at least it's possible to get rid of half
of the nastyness here by removing getter which was only used in
an assert statement.

That piece of code was already well-tested and this code becomes
obsolete in the new depsgraph and does no longer exists in blender
2.8 branch.
This commit is contained in:
Sergey Sharybin
2017-03-01 12:51:51 +01:00
parent ecee40e919
commit 7fcae7ba60
3 changed files with 0 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/intern/scene.c
View File

@@ -1510,8 +1510,6 @@ static void scene_update_object_func(TaskPool * __restrict pool, void *taskdata,
if (add_to_stats) {
StatisicsEntry *entry;
BLI_assert(threadid < BLI_pool_get_num_threads(pool));
entry = MEM_mallocN(sizeof(StatisicsEntry), "update thread statistics");
entry->object = object;
entry->start_time = start_time;

3
source/blender/blenlib/BLI_task.h
View File

@@ -98,9 +98,6 @@ void BLI_task_pool_cancel(TaskPool *pool);
/* stop all worker threads */
void BLI_task_pool_stop(TaskPool *pool);
/* get number of threads allowed to be used by this pool */
int BLI_pool_get_num_threads(TaskPool *pool);
/* set number of threads allowed to be used by this pool */
void BLI_pool_set_num_threads(TaskPool *pool, int num_threads);

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

@@ -687,16 +687,6 @@ void BLI_task_pool_work_and_wait(TaskPool *pool)
BLI_mutex_unlock(&pool->num_mutex);
}
int BLI_pool_get_num_threads(TaskPool *pool)
{
if (pool->num_threads != 0) {
return pool->num_threads;
}
else {
return BLI_task_scheduler_num_threads(pool->scheduler);
}
}
void BLI_pool_set_num_threads(TaskPool *pool, int num_threads)
{
/* NOTE: Don't try to modify threads while tasks are running! */