kossLAN/wry
1
0
Fork 0
forked from wry/wry
Code Pull requests Activity

xwayland: use io_uring to prevent lockups

Browse source 
See https://gitlab.freedesktop.org/wayland/wayland/-/issues/296
This commit is contained in:
Julian Orth 2022-05-11 21:45:15 +02:00
parent 5573b2a1b7
commit 285724b4f1
13 changed files with 1173 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/compositor.rs
View file

@ -18,6 +18,7 @@ use {
forker,
globals::Globals,
ifs::{wl_output::WlOutputGlobal, wl_surface::NoneSurfaceExt},
io_uring::{IoUring, IoUringError},
leaks,
logger::Logger,
render::{self, RenderError},
@ -87,6 +88,8 @@ pub enum CompositorError {
AsyncError(#[from] AsyncError),
#[error("The render backend caused an error")]
RenderError(#[from] RenderError),
#[error("Could not create an io-uring")]
IoUringError(#[from] IoUringError),
}
pub const WAYLAND_DISPLAY: &str = "WAYLAND_DISPLAY";
@ -117,6 +120,7 @@ fn start_compositor2(
let xkb_keymap = xkb_ctx.keymap_from_str(include_str!("keymap.xkb")).unwrap();
let wheel = Wheel::install(&el)?;
let engine = AsyncEngine::install(&el, &wheel)?;
let io_uring = IoUring::new(&engine, 32)?;
let (_run_toplevel_future, run_toplevel) = RunToplevel::install(&engine);
let node_ids = NodeIds::default();
let state = Rc::new(State {
@ -182,6 +186,7 @@ fn start_compositor2(
tracker: Default::default(),
data_offer_ids: Default::default(),
drm_dev_ids: Default::default(),
io_uring,
});
state.tracker.register(ClientId::from_raw(0));
create_dummy_output(&state);