diff options
author | Timothy Arceri <[email protected]> | 2017-03-06 11:58:27 +1100 |
---|---|---|
committer | Timothy Arceri <[email protected]> | 2017-03-07 09:12:16 +1100 |
commit | d82d8be6148b599ce47bf4c0e6ae4e27cf5cc233 (patch) | |
tree | 9eaea02e95bb7ab99c64a9c1b812fdff64ae47c2 /src/gallium/drivers | |
parent | da40ac65c7b9f8d877fb6f79b2a29138237ec868 (diff) |
gallium/util: replace pipe_thread_wait() with thrd_join()
Replace done using:
find ./src -type f -exec sed -i -- \
's:pipe_thread_wait(\([^)]*\)):thrd_join(\1, NULL):g' {} \;
Reviewed-by: Plamena Manolova <[email protected]>
Reviewed-by: Marek Olšák <[email protected]>
Diffstat (limited to 'src/gallium/drivers')
-rw-r--r-- | src/gallium/drivers/ddebug/dd_context.c | 2 | ||||
-rw-r--r-- | src/gallium/drivers/llvmpipe/lp_rast.c | 2 | ||||
-rw-r--r-- | src/gallium/drivers/radeon/r600_gpu_load.c | 2 | ||||
-rw-r--r-- | src/gallium/drivers/rbug/rbug_core.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/gallium/drivers/ddebug/dd_context.c b/src/gallium/drivers/ddebug/dd_context.c index a52975d8cb2..eae128a2a0f 100644 --- a/src/gallium/drivers/ddebug/dd_context.c +++ b/src/gallium/drivers/ddebug/dd_context.c @@ -597,7 +597,7 @@ dd_context_destroy(struct pipe_context *_pipe) mtx_lock(&dctx->mutex); dctx->kill_thread = 1; mtx_unlock(&dctx->mutex); - pipe_thread_wait(dctx->thread); + thrd_join(dctx->thread, NULL); mtx_destroy(&dctx->mutex); assert(!dctx->records); } diff --git a/src/gallium/drivers/llvmpipe/lp_rast.c b/src/gallium/drivers/llvmpipe/lp_rast.c index 2f222d00589..678ef0bd0bf 100644 --- a/src/gallium/drivers/llvmpipe/lp_rast.c +++ b/src/gallium/drivers/llvmpipe/lp_rast.c @@ -956,7 +956,7 @@ void lp_rast_destroy( struct lp_rasterizer *rast ) #ifdef _WIN32 pipe_semaphore_wait(&rast->tasks[i].work_done); #else - pipe_thread_wait(rast->threads[i]); + thrd_join(rast->threads[i], NULL); #endif } diff --git a/src/gallium/drivers/radeon/r600_gpu_load.c b/src/gallium/drivers/radeon/r600_gpu_load.c index df43a6e8752..1b51af4cdc0 100644 --- a/src/gallium/drivers/radeon/r600_gpu_load.c +++ b/src/gallium/drivers/radeon/r600_gpu_load.c @@ -170,7 +170,7 @@ void r600_gpu_load_kill_thread(struct r600_common_screen *rscreen) return; p_atomic_inc(&rscreen->gpu_load_stop_thread); - pipe_thread_wait(rscreen->gpu_load_thread); + thrd_join(rscreen->gpu_load_thread, NULL); rscreen->gpu_load_thread = 0; } diff --git a/src/gallium/drivers/rbug/rbug_core.c b/src/gallium/drivers/rbug/rbug_core.c index 5752e5e739c..d09c4b51960 100644 --- a/src/gallium/drivers/rbug/rbug_core.c +++ b/src/gallium/drivers/rbug/rbug_core.c @@ -869,7 +869,7 @@ rbug_stop(struct rbug_rbug *tr_rbug) return; tr_rbug->running = false; - pipe_thread_wait(tr_rbug->thread); + thrd_join(tr_rbug->thread, NULL); FREE(tr_rbug); |