From 57574495d8c6ee627e83a87caba6278c15c7b710 Mon Sep 17 00:00:00 2001 From: bunnie Date: Tue, 24 Aug 2021 23:35:32 +0800 Subject: [PATCH] handle case of sleep request before resume is fully completed --- services/susres/src/main.rs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/services/susres/src/main.rs b/services/susres/src/main.rs index 531551f97..30050e9ef 100644 --- a/services/susres/src/main.rs +++ b/services/susres/src/main.rs @@ -599,7 +599,7 @@ fn xmain() -> ! { do_hook(hookdata, &mut suspend_subscribers); }, Some(Opcode::SuspendReady) => msg_scalar_unpack!(msg, token, _, _, _, { - log::trace!("suspendready with token {}", token); + //log::trace!("suspendready with token {}", token); if !suspend_requested { log::error!("received a SuspendReady message when a suspend wasn't pending. Ignoring."); continue; @@ -644,7 +644,9 @@ fn xmain() -> ! { } }), Some(Opcode::SuspendRequest) => { - if allow_suspend { + // if the 2-second timeout is still pending from a previous suspend, deny the suspend request. + // ...just don't suspend that quickly after resuming??? + if allow_suspend && !timeout_pending { suspend_requested = true; // clear the resume gate SHOULD_RESUME.store(false, Ordering::Relaxed);