fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-24 06:40:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

llvmpipe: fixed race condition in lp_rast_destroy that causes a crash on windows

Browse source 
Acked-By: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26345>
This commit is contained in:
Dario Mylonopoulos 2023-11-21 23:58:03 +01:00 • committed by Marge Bot
parent 98ec98d08f
commit d0bbab98df
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/gallium/drivers/llvmpipe/lp_rast.c
View file

@ -1218,7 +1218,7 @@ thread_function(void *init_data)
}
#ifdef _WIN32
util_semaphore_signal(&task->work_done);
util_semaphore_signal(&task->exited);
#endif
return 0;
@ -1235,6 +1235,9 @@ create_rast_threads(struct lp_rasterizer *rast)
for (unsigned i = 0; i < rast->num_threads; i++) {
util_semaphore_init(&rast->tasks[i].work_ready, 0);
util_semaphore_init(&rast->tasks[i].work_done, 0);
#ifdef _WIN32
util_semaphore_init(&rast->tasks[i].exited, 0);
#endif
if (thrd_success != u_thread_create(rast->threads + i, thread_function,
(void *) &rast->tasks[i])) {
rast->num_threads = i; /* previous thread is max */
@ -1328,7 +1331,7 @@ lp_rast_destroy(struct lp_rasterizer *rast)
DWORD exit_code = STILL_ACTIVE;
if (GetExitCodeThread(rast->threads[i].handle, &exit_code) &&
exit_code == STILL_ACTIVE) {
util_semaphore_wait(&rast->tasks[i].work_done);
util_semaphore_wait(&rast->tasks[i].exited);
}
#else
thrd_join(rast->threads[i], NULL);
@ -1339,6 +1342,9 @@ lp_rast_destroy(struct lp_rasterizer *rast)
for (unsigned i = 0; i < rast->num_threads; i++) {
util_semaphore_destroy(&rast->tasks[i].work_ready);
util_semaphore_destroy(&rast->tasks[i].work_done);
#ifdef _WIN32
util_semaphore_destroy(&rast->tasks[i].exited);
#endif
}
for (unsigned i = 0; i < MAX2(1, rast->num_threads); i++) {
align_free(rast->tasks[i].thread_data.cache);

3
src/gallium/drivers/llvmpipe/lp_rast_priv.h
View file

@ -102,6 +102,9 @@ struct lp_rasterizer_task
util_semaphore work_ready;
util_semaphore work_done;
#ifdef _WIN32
util_semaphore exited;
#endif
};