Mesa (master): llvmpipe: clean up rasterization threads upon context destruction
Brian Paul
brianp at kemper.freedesktop.org
Thu Feb 25 00:32:05 UTC 2010
Module: Mesa
Branch: master
Commit: bc04ae21c10bedcc75d3483784d3eaf7bf090f55
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=bc04ae21c10bedcc75d3483784d3eaf7bf090f55
Author: Brian Paul <brianp at vmware.com>
Date: Wed Feb 24 17:30:43 2010 -0700
llvmpipe: clean up rasterization threads upon context destruction
Fixes glean hang, bug 26536.
---
src/gallium/drivers/llvmpipe/lp_rast.c | 17 +++++++++++++++++
src/gallium/drivers/llvmpipe/lp_rast_priv.h | 1 +
2 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/src/gallium/drivers/llvmpipe/lp_rast.c b/src/gallium/drivers/llvmpipe/lp_rast.c
index 07817ef..82c006d 100644
--- a/src/gallium/drivers/llvmpipe/lp_rast.c
+++ b/src/gallium/drivers/llvmpipe/lp_rast.c
@@ -826,6 +826,9 @@ static PIPE_THREAD_ROUTINE( thread_func, init_data )
debug_printf("thread %d waiting for work\n", task->thread_index);
pipe_semaphore_wait(&task->work_ready);
+ if (rast->exit_flag)
+ break;
+
if (task->thread_index == 0) {
/* thread[0]:
* - get next scene to rasterize
@@ -961,6 +964,20 @@ void lp_rast_destroy( struct lp_rasterizer *rast )
align_free(rast->tasks[i].tile.color[cbuf]);
}
+ /* Set exit_flag and signal each thread's work_ready semaphore.
+ * Each thread will be woken up, notice that the exit_flag is set and
+ * break out of its main loop. The thread will then exit.
+ */
+ rast->exit_flag = TRUE;
+ for (i = 0; i < rast->num_threads; i++) {
+ pipe_semaphore_signal(&rast->tasks[i].work_ready);
+ }
+
+ for (i = 0; i < rast->num_threads; i++) {
+ pipe_semaphore_destroy(&rast->tasks[i].work_ready);
+ pipe_semaphore_destroy(&rast->tasks[i].work_done);
+ }
+
/* for synchronizing rasterization threads */
pipe_barrier_destroy( &rast->barrier );
diff --git a/src/gallium/drivers/llvmpipe/lp_rast_priv.h b/src/gallium/drivers/llvmpipe/lp_rast_priv.h
index 382e169..abc5a9a 100644
--- a/src/gallium/drivers/llvmpipe/lp_rast_priv.h
+++ b/src/gallium/drivers/llvmpipe/lp_rast_priv.h
@@ -84,6 +84,7 @@ struct lp_rasterizer
{
boolean clipped_tile;
boolean check_for_clipped_tiles;
+ boolean exit_flag;
/* Framebuffer stuff
*/
More information about the mesa-commit
mailing list