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

Fix deadlocks on some awaits

Browse Source
This commit is contained in:
Luke D Jones
2020-08-13 16:59:36 +12:00
parent 53c1a0ffcf
commit 4a5f029e53
4 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
asus-nb-ctrl/src/ctrl_fan_cpu.rs
View File

@@ -41,21 +41,19 @@ impl crate::Controller for CtrlFanAndCPU {
tokio::spawn(async move {
while let Some(mode) = recv.recv().await {
let mut config = config1.lock().await;
if let Ok(mut lock) = gate1.try_lock() {
lock.set_fan_mode(mode, &mut config)
.unwrap_or_else(|err| warn!("{:?}", err));
}
let mut lock = gate1.lock().await;
lock.set_fan_mode(mode, &mut config)
.unwrap_or_else(|err| warn!("{:?}", err));
}
}),
// need to watch file path
tokio::spawn(async move {
loop {
if let Ok(mut lock) = gate2.try_lock() {
let mut config = config.lock().await;
let mut lock = gate2.lock().await;
if let Ok(mut config) = config.try_lock() {
lock.fan_mode_check_change(&mut config)
.unwrap_or_else(|err| warn!("{:?}", err));
}
tokio::time::delay_for(std::time::Duration::from_millis(500)).await;
}
}),