blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 748 Projects 19 Wiki Activity

BLI_task: make foreach loop index hleper lockfree, take II. 

New code is actually much, much better than first version, using 'fetch_and_add' atomic op
here allows us to get rid of the loop etc.

The broken CAS issue remains on windows, to be investigated...
This commit is contained in:
Bastien Montagne 2016-05-16 15:57:19 +02:00
parent 75a96f8325
commit 575d7a9666
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -776,23 +776,18 @@ typedef struct ParallelRangeState {
int iter;
int chunk_size;
SpinLock lock;
} ParallelRangeState;
BLI_INLINE bool parallel_range_next_iter_get(
ParallelRangeState * __restrict state,
int * __restrict iter, int * __restrict count)
{
bool result = false;
BLI_spin_lock(&state->lock);
if (state->iter < state->stop) {
*count = min_ii(state->chunk_size, state->stop - state->iter);
*iter = state->iter;
state->iter += *count;
result = true;
}
BLI_spin_unlock(&state->lock);
return result;
uint32_t previter = atomic_fetch_and_add_uint32((uint32_t *)(&state->iter), state->chunk_size);
*iter = (int)previter;
*count = max_ii(0, min_ii(state->chunk_size, state->stop - previter));
return (previter < state->stop);
}
static void parallel_range_func(
@ -897,7 +892,6 @@ static void task_parallel_range_ex(
*/
num_tasks = num_threads * 2;
BLI_spin_init(&state.lock);
state.start = start;
state.stop = stop;
state.userdata = userdata;
@ -914,6 +908,7 @@ static void task_parallel_range_ex(
}
num_tasks = min_ii(num_tasks, (stop - start) / state.chunk_size);
atomic_fetch_and_add_uint32((uint32_t *)(&state.iter), 0);
for (i = 0; i < num_tasks; i++) {
BLI_task_pool_push(task_pool,
@ -924,8 +919,6 @@ static void task_parallel_range_ex(
BLI_task_pool_work_and_wait(task_pool);
BLI_task_pool_free(task_pool);
BLI_spin_end(&state.lock);
}
/**