diff options
author | Campbell Barton <ideasman42@gmail.com> | 2017-03-01 16:22:13 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2017-03-01 16:22:13 +0300 |
commit | 8901263b5f04152a9c6a897c5115acd51be11bf1 (patch) | |
tree | 14629685150a04440e2629fd45bd90891b8767ed /source/blender/blenlib/intern/task.c | |
parent | f64df0e1024c2447ad449d0bf63def871ee47925 (diff) | |
parent | 714e85b5344db7d9c9c7ac0a91cd0bb574c35353 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenlib/intern/task.c')
-rw-r--r-- | source/blender/blenlib/intern/task.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/source/blender/blenlib/intern/task.c b/source/blender/blenlib/intern/task.c index fc2d9674c2f..c4761e9f7ef 100644 --- a/source/blender/blenlib/intern/task.c +++ b/source/blender/blenlib/intern/task.c @@ -106,7 +106,6 @@ struct TaskPool { TaskScheduler *scheduler; volatile size_t num; - volatile size_t done; size_t num_threads; size_t currently_running_tasks; ThreadMutex num_mutex; @@ -238,7 +237,6 @@ static void task_pool_num_decrease(TaskPool *pool, size_t done) pool->num -= done; atomic_sub_and_fetch_z(&pool->currently_running_tasks, done); - pool->done += done; if (pool->num == 0) BLI_condition_notify_all(&pool->num_cond); @@ -504,7 +502,6 @@ static TaskPool *task_pool_create_ex(TaskScheduler *scheduler, void *userdata, c pool->scheduler = scheduler; pool->num = 0; - pool->done = 0; pool->num_threads = 0; pool->currently_running_tasks = 0; pool->do_cancel = false; @@ -743,11 +740,6 @@ ThreadMutex *BLI_task_pool_user_mutex(TaskPool *pool) return &pool->user_mutex; } -size_t BLI_task_pool_tasks_done(TaskPool *pool) -{ - return pool->done; -} - /* Parallel range routines */ /** |