mirror of
https://github.com/marcoallegretti/WEFT_OS.git
synced 2026-03-27 01:13:09 +00:00
fix(shell): harden Servo shell and app shell against rendering and lifecycle failures
- blit_software: replace expect() on softbuffer Context and Surface creation with log-and-skip so a frame failure does not crash the process - blit_software: replace NonZeroU32::new(1).unwrap() with NonZeroU32::MIN - resumed: replace create_window().expect() with a match that calls event_loop.exit() and returns on failure instead of unwinding - build_rendering_ctx: return Option<RenderingCtx> instead of panicking when SoftwareRenderingContext creation fails; callers exit cleanly - resumed (app-shell): exit without emitting READY when no rendering context is available so weft-appd observes a clean session failure - weft-servo-shell: bound gesture forwarding to one active thread at a time using JoinHandle::is_finished(); excess batches are dropped with a debug log to prevent unbounded thread creation per event loop tick - shell_client (both shells): replace post-ensure! unwrap() with expect() that documents the invariant
This commit is contained in:
parent
b82345d24e
commit
a098b3e93d
4 changed files with 92 additions and 40 deletions
|
|
@ -130,12 +130,17 @@ impl App {
|
||||||
let Some(pixels) = rendering_context.read_pixels() else {
|
let Some(pixels) = rendering_context.read_pixels() else {
|
||||||
return;
|
return;
|
||||||
};
|
};
|
||||||
let ctx = softbuffer::Context::new(Arc::clone(window)).expect("softbuffer context");
|
let Ok(ctx) = softbuffer::Context::new(Arc::clone(window)) else {
|
||||||
let mut surface =
|
tracing::warn!("softbuffer context creation failed; skipping frame");
|
||||||
softbuffer::Surface::new(&ctx, Arc::clone(window)).expect("softbuffer surface");
|
return;
|
||||||
|
};
|
||||||
|
let Ok(mut surface) = softbuffer::Surface::new(&ctx, Arc::clone(window)) else {
|
||||||
|
tracing::warn!("softbuffer surface creation failed; skipping frame");
|
||||||
|
return;
|
||||||
|
};
|
||||||
let _ = surface.resize(
|
let _ = surface.resize(
|
||||||
std::num::NonZeroU32::new(size.width).unwrap_or(std::num::NonZeroU32::new(1).unwrap()),
|
std::num::NonZeroU32::new(size.width).unwrap_or(std::num::NonZeroU32::MIN),
|
||||||
std::num::NonZeroU32::new(size.height).unwrap_or(std::num::NonZeroU32::new(1).unwrap()),
|
std::num::NonZeroU32::new(size.height).unwrap_or(std::num::NonZeroU32::MIN),
|
||||||
);
|
);
|
||||||
let Ok(mut buf) = surface.buffer_mut() else {
|
let Ok(mut buf) = surface.buffer_mut() else {
|
||||||
return;
|
return;
|
||||||
|
|
@ -155,11 +160,14 @@ impl ApplicationHandler<ServoWake> for App {
|
||||||
|
|
||||||
let title = format!("WEFT App — {}", self.url.host_str().unwrap_or("app"));
|
let title = format!("WEFT App — {}", self.url.host_str().unwrap_or("app"));
|
||||||
let attrs = WindowAttributes::default().with_title(title);
|
let attrs = WindowAttributes::default().with_title(title);
|
||||||
let window = Arc::new(
|
let window = match event_loop.create_window(attrs) {
|
||||||
event_loop
|
Ok(w) => Arc::new(w),
|
||||||
.create_window(attrs)
|
Err(e) => {
|
||||||
.expect("failed to create app window"),
|
tracing::error!(error = %e, "failed to create app window; exiting");
|
||||||
);
|
event_loop.exit();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
};
|
||||||
let size = window.inner_size();
|
let size = window.inner_size();
|
||||||
self.window = Some(Arc::clone(&window));
|
self.window = Some(Arc::clone(&window));
|
||||||
|
|
||||||
|
|
@ -185,7 +193,11 @@ impl ApplicationHandler<ServoWake> for App {
|
||||||
|
|
||||||
servo.set_delegate(Rc::new(WeftServoDelegate));
|
servo.set_delegate(Rc::new(WeftServoDelegate));
|
||||||
|
|
||||||
let rendering_context = build_rendering_ctx(event_loop, &window, size);
|
let Some(rendering_context) = build_rendering_ctx(event_loop, &window, size) else {
|
||||||
|
tracing::error!("no rendering context available; exiting without READY signal");
|
||||||
|
event_loop.exit();
|
||||||
|
return;
|
||||||
|
};
|
||||||
|
|
||||||
let ucm = Rc::new(UserContentManager::new(&servo));
|
let ucm = Rc::new(UserContentManager::new(&servo));
|
||||||
if let Some(kit_js) = load_ui_kit_script() {
|
if let Some(kit_js) = load_ui_kit_script() {
|
||||||
|
|
@ -326,7 +338,7 @@ fn build_rendering_ctx(
|
||||||
event_loop: &ActiveEventLoop,
|
event_loop: &ActiveEventLoop,
|
||||||
window: &Arc<Window>,
|
window: &Arc<Window>,
|
||||||
size: winit::dpi::PhysicalSize<u32>,
|
size: winit::dpi::PhysicalSize<u32>,
|
||||||
) -> RenderingCtx {
|
) -> Option<RenderingCtx> {
|
||||||
if std::env::var_os("WEFT_EGL_RENDERING").is_some() {
|
if std::env::var_os("WEFT_EGL_RENDERING").is_some() {
|
||||||
let display_handle = event_loop.display_handle();
|
let display_handle = event_loop.display_handle();
|
||||||
let window_handle = window.window_handle();
|
let window_handle = window.window_handle();
|
||||||
|
|
@ -334,7 +346,7 @@ fn build_rendering_ctx(
|
||||||
match servo::WindowRenderingContext::new(dh, wh, size) {
|
match servo::WindowRenderingContext::new(dh, wh, size) {
|
||||||
Ok(rc) => {
|
Ok(rc) => {
|
||||||
tracing::info!("using EGL rendering context");
|
tracing::info!("using EGL rendering context");
|
||||||
return RenderingCtx::Egl(Rc::new(rc));
|
return Some(RenderingCtx::Egl(Rc::new(rc)));
|
||||||
}
|
}
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
tracing::warn!("EGL rendering context failed ({e}), falling back to software");
|
tracing::warn!("EGL rendering context failed ({e}), falling back to software");
|
||||||
|
|
@ -342,10 +354,14 @@ fn build_rendering_ctx(
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
RenderingCtx::Software(Rc::new(
|
match servo::SoftwareRenderingContext::new(servo::euclid::Size2D::new(size.width, size.height))
|
||||||
servo::SoftwareRenderingContext::new(servo::euclid::Size2D::new(size.width, size.height))
|
{
|
||||||
.expect("SoftwareRenderingContext"),
|
Ok(rc) => Some(RenderingCtx::Software(Rc::new(rc))),
|
||||||
))
|
Err(e) => {
|
||||||
|
tracing::error!("SoftwareRenderingContext failed: {e}");
|
||||||
|
None
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn ui_kit_path() -> std::path::PathBuf {
|
fn ui_kit_path() -> std::path::PathBuf {
|
||||||
|
|
|
||||||
|
|
@ -172,7 +172,10 @@ impl ShellClient {
|
||||||
WlSurface::from_id(&conn, id).context("wl_surface from_id")?
|
WlSurface::from_id(&conn, id).context("wl_surface from_id")?
|
||||||
};
|
};
|
||||||
|
|
||||||
let manager = data.manager.as_ref().unwrap();
|
let manager = data
|
||||||
|
.manager
|
||||||
|
.as_ref()
|
||||||
|
.expect("manager is Some; guaranteed by ensure! above");
|
||||||
let title = format!("{app_id}/{session_id}");
|
let title = format!("{app_id}/{session_id}");
|
||||||
let window = manager.create_window(
|
let window = manager.create_window(
|
||||||
app_id.to_string(),
|
app_id.to_string(),
|
||||||
|
|
|
||||||
|
|
@ -96,6 +96,7 @@ struct App {
|
||||||
modifiers: ModifiersState,
|
modifiers: ModifiersState,
|
||||||
cursor_pos: servo::euclid::default::Point2D<f32>,
|
cursor_pos: servo::euclid::default::Point2D<f32>,
|
||||||
shell_client: Option<crate::shell_client::ShellClient>,
|
shell_client: Option<crate::shell_client::ShellClient>,
|
||||||
|
gesture_thread: Option<std::thread::JoinHandle<()>>,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl App {
|
impl App {
|
||||||
|
|
@ -113,6 +114,7 @@ impl App {
|
||||||
modifiers: ModifiersState::default(),
|
modifiers: ModifiersState::default(),
|
||||||
cursor_pos: servo::euclid::default::Point2D::zero(),
|
cursor_pos: servo::euclid::default::Point2D::zero(),
|
||||||
shell_client: None,
|
shell_client: None,
|
||||||
|
gesture_thread: None,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -128,12 +130,17 @@ impl App {
|
||||||
let Some(pixels) = rendering_context.read_pixels() else {
|
let Some(pixels) = rendering_context.read_pixels() else {
|
||||||
return;
|
return;
|
||||||
};
|
};
|
||||||
let ctx = softbuffer::Context::new(Arc::clone(window)).expect("softbuffer context");
|
let Ok(ctx) = softbuffer::Context::new(Arc::clone(window)) else {
|
||||||
let mut surface =
|
tracing::warn!("softbuffer context creation failed; skipping frame");
|
||||||
softbuffer::Surface::new(&ctx, Arc::clone(window)).expect("softbuffer surface");
|
return;
|
||||||
|
};
|
||||||
|
let Ok(mut surface) = softbuffer::Surface::new(&ctx, Arc::clone(window)) else {
|
||||||
|
tracing::warn!("softbuffer surface creation failed; skipping frame");
|
||||||
|
return;
|
||||||
|
};
|
||||||
let _ = surface.resize(
|
let _ = surface.resize(
|
||||||
std::num::NonZeroU32::new(size.width).unwrap_or(std::num::NonZeroU32::new(1).unwrap()),
|
std::num::NonZeroU32::new(size.width).unwrap_or(std::num::NonZeroU32::MIN),
|
||||||
std::num::NonZeroU32::new(size.height).unwrap_or(std::num::NonZeroU32::new(1).unwrap()),
|
std::num::NonZeroU32::new(size.height).unwrap_or(std::num::NonZeroU32::MIN),
|
||||||
);
|
);
|
||||||
let Ok(mut buf) = surface.buffer_mut() else {
|
let Ok(mut buf) = surface.buffer_mut() else {
|
||||||
return;
|
return;
|
||||||
|
|
@ -152,11 +159,14 @@ impl ApplicationHandler<ServoWake> for App {
|
||||||
}
|
}
|
||||||
|
|
||||||
let attrs = WindowAttributes::default().with_title("WEFT Shell");
|
let attrs = WindowAttributes::default().with_title("WEFT Shell");
|
||||||
let window = Arc::new(
|
let window = match event_loop.create_window(attrs) {
|
||||||
event_loop
|
Ok(w) => Arc::new(w),
|
||||||
.create_window(attrs)
|
Err(e) => {
|
||||||
.expect("failed to create shell window"),
|
tracing::error!(error = %e, "failed to create shell window; exiting");
|
||||||
);
|
event_loop.exit();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
};
|
||||||
let size = window.inner_size();
|
let size = window.inner_size();
|
||||||
self.window = Some(Arc::clone(&window));
|
self.window = Some(Arc::clone(&window));
|
||||||
|
|
||||||
|
|
@ -177,7 +187,11 @@ impl ApplicationHandler<ServoWake> for App {
|
||||||
|
|
||||||
servo.set_delegate(Rc::new(WeftServoDelegate));
|
servo.set_delegate(Rc::new(WeftServoDelegate));
|
||||||
|
|
||||||
let rendering_context = build_rendering_ctx(event_loop, &window, size);
|
let Some(rendering_context) = build_rendering_ctx(event_loop, &window, size) else {
|
||||||
|
tracing::error!("no rendering context available; shell cannot start");
|
||||||
|
event_loop.exit();
|
||||||
|
return;
|
||||||
|
};
|
||||||
|
|
||||||
let user_content_manager = Rc::new(UserContentManager::new(&servo));
|
let user_content_manager = Rc::new(UserContentManager::new(&servo));
|
||||||
if let Some(kit_js) = load_ui_kit_script() {
|
if let Some(kit_js) = load_ui_kit_script() {
|
||||||
|
|
@ -226,10 +240,22 @@ impl ApplicationHandler<ServoWake> for App {
|
||||||
}
|
}
|
||||||
let gestures = sc.take_pending_gestures();
|
let gestures = sc.take_pending_gestures();
|
||||||
if !gestures.is_empty() {
|
if !gestures.is_empty() {
|
||||||
|
let prev_done = self
|
||||||
|
.gesture_thread
|
||||||
|
.as_ref()
|
||||||
|
.map(|h| h.is_finished())
|
||||||
|
.unwrap_or(true);
|
||||||
|
if prev_done {
|
||||||
let ws_port = self.ws_port;
|
let ws_port = self.ws_port;
|
||||||
std::thread::spawn(move || {
|
self.gesture_thread = Some(std::thread::spawn(move || {
|
||||||
forward_gestures_to_appd(ws_port, &gestures);
|
forward_gestures_to_appd(ws_port, &gestures);
|
||||||
});
|
}));
|
||||||
|
} else {
|
||||||
|
tracing::debug!(
|
||||||
|
count = gestures.len(),
|
||||||
|
"gesture forwarding in progress; dropping batch"
|
||||||
|
);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if let Some(servo) = &self.servo {
|
if let Some(servo) = &self.servo {
|
||||||
|
|
@ -319,7 +345,7 @@ fn build_rendering_ctx(
|
||||||
event_loop: &ActiveEventLoop,
|
event_loop: &ActiveEventLoop,
|
||||||
window: &Arc<Window>,
|
window: &Arc<Window>,
|
||||||
size: winit::dpi::PhysicalSize<u32>,
|
size: winit::dpi::PhysicalSize<u32>,
|
||||||
) -> RenderingCtx {
|
) -> Option<RenderingCtx> {
|
||||||
if std::env::var_os("WEFT_EGL_RENDERING").is_some() {
|
if std::env::var_os("WEFT_EGL_RENDERING").is_some() {
|
||||||
let display_handle = event_loop.display_handle();
|
let display_handle = event_loop.display_handle();
|
||||||
let window_handle = window.window_handle();
|
let window_handle = window.window_handle();
|
||||||
|
|
@ -327,7 +353,7 @@ fn build_rendering_ctx(
|
||||||
match servo::WindowRenderingContext::new(dh, wh, size) {
|
match servo::WindowRenderingContext::new(dh, wh, size) {
|
||||||
Ok(rc) => {
|
Ok(rc) => {
|
||||||
tracing::info!("using EGL rendering context");
|
tracing::info!("using EGL rendering context");
|
||||||
return RenderingCtx::Egl(Rc::new(rc));
|
return Some(RenderingCtx::Egl(Rc::new(rc)));
|
||||||
}
|
}
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
tracing::warn!("EGL rendering context failed ({e}), falling back to software");
|
tracing::warn!("EGL rendering context failed ({e}), falling back to software");
|
||||||
|
|
@ -335,10 +361,14 @@ fn build_rendering_ctx(
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
RenderingCtx::Software(Rc::new(
|
match servo::SoftwareRenderingContext::new(servo::euclid::Size2D::new(size.width, size.height))
|
||||||
servo::SoftwareRenderingContext::new(servo::euclid::Size2D::new(size.width, size.height))
|
{
|
||||||
.expect("SoftwareRenderingContext"),
|
Ok(rc) => Some(RenderingCtx::Software(Rc::new(rc))),
|
||||||
))
|
Err(e) => {
|
||||||
|
tracing::error!("SoftwareRenderingContext failed: {e}");
|
||||||
|
None
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// ── Public entry point ────────────────────────────────────────────────────────
|
// ── Public entry point ────────────────────────────────────────────────────────
|
||||||
|
|
|
||||||
|
|
@ -197,7 +197,10 @@ impl ShellClient {
|
||||||
WlSurface::from_id(&conn, id).context("wl_surface from_id")?
|
WlSurface::from_id(&conn, id).context("wl_surface from_id")?
|
||||||
};
|
};
|
||||||
|
|
||||||
let manager = data.manager.as_ref().unwrap();
|
let manager = data
|
||||||
|
.manager
|
||||||
|
.as_ref()
|
||||||
|
.expect("manager is Some; guaranteed by ensure! above");
|
||||||
let window = manager.create_window(
|
let window = manager.create_window(
|
||||||
"org.weft.system.shell".to_string(),
|
"org.weft.system.shell".to_string(),
|
||||||
"WEFT Shell".to_string(),
|
"WEFT Shell".to_string(),
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue