fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-09 04:38:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

rusticl/event: fix deadlock when calling clGetEventProfilingInfo inside callbacks

Browse source 
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/11243
Cc: mesa-stable
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29483>
This commit is contained in:
Karol Herbst 2024-05-30 14:16:23 +02:00 • committed by Marge Bot
parent 14ec84da17
commit 6f713a764f
1 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/gallium/frontends/rusticl/core/event.rs
View file

@ -100,7 +100,7 @@ impl Event {
self.state().status
}
fn set_status(&self, lock: &mut MutexGuard<EventMutState>, new: cl_int) {
fn set_status(&self, mut lock: MutexGuard<EventMutState>, new: cl_int) {
lock.status = new;
// signal on completion or an error
@ -113,14 +113,17 @@ impl Event {
if [CL_COMPLETE, CL_RUNNING, CL_SUBMITTED].contains(&cb_idx) {
if let Some(cbs) = lock.cbs.get_mut(cb_idx as usize) {
cbs.drain(..).for_each(|cb| cb.call(self, new));
let cbs = mem::take(cbs);
// applications might want to access the event in the callback, so drop the lock
// before calling into the callbacks.
drop(lock);
cbs.into_iter().for_each(|cb| cb.call(self, new));
}
}
}
pub fn set_user_status(&self, status: cl_int) {
let mut lock = self.state();
self.set_status(&mut lock, status);
self.set_status(self.state(), status);
}
pub fn is_error(&self) -> bool {
@ -166,10 +169,8 @@ impl Event {
}
pub(super) fn signal(&self) {
let mut lock = self.state();
self.set_status(&mut lock, CL_RUNNING as cl_int);
self.set_status(&mut lock, CL_COMPLETE as cl_int);
self.set_status(self.state(), CL_RUNNING as cl_int);
self.set_status(self.state(), CL_COMPLETE as cl_int);
}
pub fn wait(&self) -> cl_int {
@ -225,7 +226,7 @@ impl Event {
lock.time_start = query_start.unwrap().read_blocked();
lock.time_end = query_end.unwrap().read_blocked();
}
self.set_status(&mut lock, new);
self.set_status(lock, new);
}
}