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

rusticl/event: make set_status handle error status properly

Browse source 
Event::set_status only called the cbs for the passed in status, but we
need it to call all cbs up to the passed in status. This simplifies error
handling.

Cc: mesa-stable
Reviewed-by: @LingMan
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30215>
(cherry picked from commit d2d3f8e446)
This commit is contained in:
Karol Herbst 2024-07-17 13:16:43 +02:00 • committed by Eric Engestrom
parent c5d762f934
commit 550c965c7b
2 changed files with 35 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -234,7 +234,7 @@
"description": "rusticl/event: make set_status handle error status properly",
"nominated": true,
"nomination_type": 0,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": null,
"notes": null

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

@ -108,17 +108,41 @@ impl Event {
self.cv.notify_all();
}
// on error we need to call the CL_COMPLETE callbacks
let cb_idx = if new < 0 { CL_COMPLETE } else { new as u32 };
// errors we treat as CL_COMPLETE
let cb_max = if new < 0 { CL_COMPLETE } else { new as u32 };
if [CL_COMPLETE, CL_RUNNING, CL_SUBMITTED].contains(&cb_idx) {
if let Some(cbs) = lock.cbs.get_mut(cb_idx as usize) {
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));
}
// there are only callbacks for those
if ![CL_COMPLETE, CL_RUNNING, CL_SUBMITTED].contains(&cb_max) {
return;
}
let mut cbs = Vec::new();
// Collect all cbs we need to call first. Technically it is not required to call them in
// order, but let's be nice to applications as it's for free
for idx in (cb_max..=CL_SUBMITTED).rev() {
cbs.extend(
// use mem::take as each callback is only supposed to be called exactly once
mem::take(&mut lock.cbs[idx as usize])
.into_iter()
// we need to save the status this cb was registered with
.map(|cb| (idx as cl_int, cb)),
);
}
// applications might want to access the event in the callback, so drop the lock before
// calling into the callbacks.
drop(lock);
for (idx, cb) in cbs {
// from the CL spec:
//
// event_command_status is equal to the command_exec_callback_type used while
// registering the callback. [...] If the callback is called as the result of the
// command associated with event being abnormally terminated, an appropriate error code
// for the error that caused the termination will be passed to event_command_status
// instead.
let status = if new < 0 { new } else { idx };
cb.call(self, status);
}
}