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

Revert "rusticl/queue: gracefully stop the worker thread"

Browse source 
Apparently this code caused issues and the fix was only papering over the
issue, which I now I can't trigger anyway.

This reverts commit 9d458b7fc1.

Fixes: 9d458b7fc1 ("rusticl/queue: gracefully stop the worker thread")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30067>
(cherry picked from commit 47377b550f)
This commit is contained in:
Karol Herbst 2024-07-08 16:34:22 +02:00 • committed by Eric Engestrom
parent 732f91128a
commit b63aeb37ab
2 changed files with 6 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -17864,7 +17864,7 @@
"description": "Revert \"rusticl/queue: gracefully stop the worker thread\"",
"nominated": false,
"nomination_type": 2,
"resolution": 4,
"resolution": 1,
"main_sha": null,
"because_sha": "9d458b7fc15a87720397b5b3d94a0971ed4aa59d",
"notes": null

21
src/gallium/frontends/rusticl/core/queue.rs
View file

@ -11,7 +11,6 @@ use rusticl_opencl_gen::*;
use std::cmp;
use std::mem;
use std::mem::ManuallyDrop;
use std::ops::Deref;
use std::sync::mpsc;
use std::sync::Arc;
@ -76,7 +75,7 @@ struct QueueState {
last: Weak<Event>,
// `Sync` on `Sender` was stabilized in 1.72, until then, put it into our Mutex.
// see https://github.com/rust-lang/rust/commit/5f56956b3c7edb9801585850d1f41b0aeb1888ff
chan_in: ManuallyDrop<mpsc::Sender<Vec<Arc<Event>>>>,
chan_in: mpsc::Sender<Vec<Arc<Event>>>,
}
pub struct Queue {
@ -86,7 +85,7 @@ pub struct Queue {
pub props: cl_command_queue_properties,
pub props_v2: Option<Properties<cl_queue_properties>>,
state: Mutex<QueueState>,
thrd: ManuallyDrop<JoinHandle<()>>,
_thrd: JoinHandle<()>,
}
impl_cl_type_trait!(cl_command_queue, Queue, CL_INVALID_COMMAND_QUEUE);
@ -118,9 +117,9 @@ impl Queue {
state: Mutex::new(QueueState {
pending: Vec::new(),
last: Weak::new(),
chan_in: ManuallyDrop::new(tx_q),
chan_in: tx_q,
}),
thrd: ManuallyDrop::new(thread::Builder::new()
_thrd: thread::Builder::new()
.name("rusticl queue thread".into())
.spawn(move || {
// Track the error of all executed events. This is only needed for in-order
@ -198,7 +197,7 @@ impl Queue {
flush_events(&mut flushed, &ctx);
}
})
.unwrap()),
.unwrap(),
}))
}
@ -261,15 +260,5 @@ impl Drop for Queue {
// commands in command_queue.
// TODO: maybe we have to do it on every release?
let _ = self.flush(true);
let state = self.state.get_mut().unwrap();
unsafe {
// disconnect the channel
ManuallyDrop::drop(&mut state.chan_in);
// and now explicitly wait on the thread to quit, because it won't happen implicitly.
ManuallyDrop::take(&mut self.thrd).join().unwrap();
}
}
}