llvmpipe: clean up rasterization threads upon context destruction

Fixes glean hang, bug 26536.
This commit is contained in:
Brian Paul 2010-02-24 17:30:43 -07:00
parent 072aeb57bd
commit bc04ae21c1
2 changed files with 18 additions and 0 deletions

View file

@ -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 );

View file

@ -84,6 +84,7 @@ struct lp_rasterizer
{
boolean clipped_tile;
boolean check_for_clipped_tiles;
boolean exit_flag;
/* Framebuffer stuff
*/