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

Refresh sessions list every 3rd active check

Browse Source
This commit is contained in:
Luke D Jones
2021-03-12 15:04:37 +13:00
parent 8a63dce85f
commit 842fa48fac
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -421,18 +421,29 @@ impl CtrlGraphics {
vendor: GfxVendors, vendor: GfxVendors,
devices: Vec<GraphicsDevice>, devices: Vec<GraphicsDevice>,
bus: PciBus, bus: PciBus,
sessions: Vec<session_manager::Session>,
killer: mpsc::Receiver<bool>, killer: mpsc::Receiver<bool>,
) -> Result<String, RogError> { ) -> Result<String, RogError> {
info!("GFX: display-manager thread started"); info!("GFX: display-manager thread started");
let mut sessions: Vec<session_manager::Session> = get_sessions().unwrap();
const SLEEP_PERIOD: Duration = Duration::from_millis(300);
const REFRESH_COUNTDOWN: u32 = 3;
let mut refresh_sessions = REFRESH_COUNTDOWN;
while are_gfx_sessions_alive(&sessions) { while are_gfx_sessions_alive(&sessions) {
if let Ok(stop) = killer.try_recv() { if let Ok(stop) = killer.try_recv() {
if stop { if stop {
return Ok("Graphics mode change was cancelled".into()); return Ok("Graphics mode change was cancelled".into());
} }
} }
sleep(Duration::from_millis(300)); // Don't spin at max speed
sleep(SLEEP_PERIOD);
if refresh_sessions == 0 {
refresh_sessions = REFRESH_COUNTDOWN;
sessions = get_sessions().unwrap();
}
refresh_sessions -= 1;
} }
info!("GFX: all graphical user sessions ended, continuing"); info!("GFX: all graphical user sessions ended, continuing");
Self::do_display_manager_action("stop")?; Self::do_display_manager_action("stop")?;
@@ -485,7 +496,6 @@ impl CtrlGraphics {
let devices = self.nvidia.clone(); let devices = self.nvidia.clone();
let bus = self.bus.clone(); let bus = self.bus.clone();
let sessions = get_sessions().unwrap();
let (tx, rx) = mpsc::channel(); let (tx, rx) = mpsc::channel();
if let Ok(mut lock) = self.thread_kill.lock() { if let Ok(mut lock) = self.thread_kill.lock() {
*lock = Some(tx); *lock = Some(tx);
@@ -496,7 +506,7 @@ impl CtrlGraphics {
Self::save_gfx_mode(vendor, self.config.clone())?; Self::save_gfx_mode(vendor, self.config.clone())?;
let _join: JoinHandle<()> = std::thread::spawn(move || { let _join: JoinHandle<()> = std::thread::spawn(move || {
Self::fire_starter(vendor, devices, bus, sessions, rx) Self::fire_starter(vendor, devices, bus, rx)
.map_err(|err| { .map_err(|err| {
error!("GFX: {}", err); error!("GFX: {}", err);
}) })