blender
/
blender
133
398
Fork 579
Code Issues 6.3k Pull Requests 751 Projects 19 Wiki Activity

Task scheduler: Cleanup, use BLI_assert() instead of assert()

This commit is contained in:
Sergey Sharybin 2017-03-06 11:33:27 +01:00
parent 3623f32b48
commit b498db06eb
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -180,9 +180,9 @@ BLI_INLINE TaskMemPool *get_task_mempool(TaskPool *pool, const int thread_id)
static Task *task_alloc(TaskPool *pool, const int thread_id)
{
assert(thread_id <= pool->scheduler->num_threads);
BLI_assert(thread_id <= pool->scheduler->num_threads);
if (thread_id != -1) {
assert(thread_id >= 0);
BLI_assert(thread_id >= 0);
TaskMemPool *mem_pool = get_task_mempool(pool, thread_id);
/* Try to re-use task memory from a thread local storage. */
if (mem_pool->num_tasks > 0) {
@ -204,8 +204,8 @@ static Task *task_alloc(TaskPool *pool, const int thread_id)
static void task_free(TaskPool *pool, Task *task, const int thread_id)
{
task_data_free(task, thread_id);
assert(thread_id >= 0);
assert(thread_id <= pool->scheduler->num_threads);
BLI_assert(thread_id >= 0);
BLI_assert(thread_id <= pool->scheduler->num_threads);
TaskMemPool *mem_pool = get_task_mempool(pool, thread_id);
if (mem_pool->num_tasks < MEMPOOL_SIZE - 1) {
/* Successfully allowed the task to be re-used later. */