gilles/asusctl
1
0
Fork 0
mirror of https://gitlab.com/asus-linux/asusctl.git synced 2026-02-06 00:15:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add display-manager restart check

Browse Source
This commit is contained in:
Luke D Jones
2021-03-10 18:42:44 +13:00
parent def0259d24
commit 6743d5bc78
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
daemon/src/ctrl_gfx/gfx.rs
View File

@@ -317,25 +317,25 @@ impl CtrlGraphics {
Ok(()) Ok(())
} }
fn wait_display_manager_inactive() -> Result<(), RogError> { fn wait_display_manager_state(state: &str) -> Result<(), RogError> {
let mut cmd = Command::new("systemctl"); let mut cmd = Command::new("systemctl");
cmd.arg("is-active"); cmd.arg("is-active");
cmd.arg(DISPLAY_MANAGER); cmd.arg(DISPLAY_MANAGER);
let mut count = 0; let mut count = 0;
while count <= 4 { while count <= 5 {
let output = cmd let output = cmd
.output() .output()
.map_err(|err| RogError::Command(format!("{:?}", cmd), err))?; .map_err(|err| RogError::Command(format!("{:?}", cmd), err))?;
if output.stdout.starts_with("inactive".as_bytes()) { if output.stdout.starts_with(state.as_bytes()) {
return Ok(()); return Ok(());
} }
std::thread::sleep(std::time::Duration::from_millis(500)); std::thread::sleep(std::time::Duration::from_millis(500));
count += 1; count += 1;
} }
return Err( return Err(
GfxError::DisplayManager("display-manager did not completely stop".into()).into(), GfxError::DisplayManager(format!("display-manager timed out waiting for {} state", state).into()).into(),
); );
} }
@@ -373,9 +373,13 @@ impl CtrlGraphics {
/// Will stop and start display manager without warning /// Will stop and start display manager without warning
pub fn set_gfx_config(&mut self, vendor: GfxVendors) -> Result<String, RogError> { pub fn set_gfx_config(&mut self, vendor: GfxVendors) -> Result<String, RogError> {
Self::do_display_manager_action("stop")?; Self::do_display_manager_action("stop")?;
Self::wait_display_manager_inactive()?; Self::wait_display_manager_state("inactive")?;
self.do_vendor_tasks(vendor)?; self.do_vendor_tasks(vendor)?;
Self::do_display_manager_action("start")?; Self::do_display_manager_action("start")?;
if Self::wait_display_manager_state("active").is_err() {
Self::do_display_manager_action("restart")?;
}
Self::wait_display_manager_state("active")?;
// TODO: undo if failed? Save last mode, catch errors... // TODO: undo if failed? Save last mode, catch errors...
let v: &str = vendor.into(); let v: &str = vendor.into();
Ok(format!("Graphics mode changed to {} successfully", v)) Ok(format!("Graphics mode changed to {} successfully", v))