gilles/asusctl
1
0
Fork 0
mirror of https://gitlab.com/asus-linux/asusctl.git synced 2026-01-22 17:33:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix fancurves

Browse Source
This commit is contained in:
Luke D. Jones
2024-03-13 14:08:08 +13:00
parent bb7b3a81fb
commit 0985eca7ce
1 changed files with 30 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
asusd/src/ctrl_fancurves.rs
View File

@@ -21,9 +21,7 @@ pub const FAN_CURVE_ZBUS_PATH: &str = "/org/asuslinux/FanCurves";
#[derive(Deserialize, Serialize, Debug, Default)] #[derive(Deserialize, Serialize, Debug, Default)]
pub struct FanCurveConfig { pub struct FanCurveConfig {
pub balanced: Vec<CurveData>, pub profiles: FanCurveProfiles,
pub performance: Vec<CurveData>,
pub quiet: Vec<CurveData>,
#[serde(skip)] #[serde(skip)]
pub current: u8, pub current: u8,
} }
@@ -49,7 +47,6 @@ impl StdConfigLoad for FanCurveConfig {}
#[derive(Debug, Clone)] #[derive(Debug, Clone)]
pub struct CtrlFanCurveZbus { pub struct CtrlFanCurveZbus {
config: Arc<Mutex<FanCurveConfig>>, config: Arc<Mutex<FanCurveConfig>>,
fan_curves: Arc<Mutex<FanCurveProfiles>>,
platform: RogPlatform, platform: RogPlatform,
} }
@@ -64,8 +61,9 @@ impl CtrlFanCurveZbus {
let mut config = FanCurveConfig::new(); let mut config = FanCurveConfig::new();
let mut fan_curves = FanCurveProfiles::default(); let mut fan_curves = FanCurveProfiles::default();
// Only do defaults if the config doesn't already exist // Only do defaults if the config doesn't already exist\
if !config.file_path().exists() { dbg!(&config);
if config.profiles.balanced.is_empty() || !config.file_path().exists() {
info!("{MOD_NAME}: Fetching default fan curves"); info!("{MOD_NAME}: Fetching default fan curves");
for this in [ for this in [
@@ -82,45 +80,28 @@ impl CtrlFanCurveZbus {
let active = platform let active = platform
.get_throttle_thermal_policy() .get_throttle_thermal_policy()
.map_or(ThrottlePolicy::Balanced, |t| t.into()); .map_or(ThrottlePolicy::Balanced, |t| t.into());
fan_curves.read_from_dev_profile(active, &find_fan_curve_node()?)?;
info!("{MOD_NAME}: {active:?}:"); info!("{MOD_NAME}: {active:?}:");
for curve in fan_curves.get_fan_curves_for(active) { for curve in fan_curves.get_fan_curves_for(active) {
info!("{}", String::from(curve)); info!("{}", String::from(curve));
} }
} }
config.profiles = fan_curves;
config.write(); config.write();
} else { } else {
info!("{MOD_NAME}: Fan curves previously stored, loading..."); info!("{MOD_NAME}: Fan curves previously stored, loading...");
config = config.load(); config = config.load();
fan_curves.balanced = config.balanced.clone();
fan_curves.performance = config.performance.clone();
fan_curves.quiet = config.quiet.clone();
} }
return Ok(Self { return Ok(Self {
config: Arc::new(Mutex::new(config)), config: Arc::new(Mutex::new(config)),
fan_curves: Arc::new(Mutex::new(fan_curves)),
platform, platform,
}); });
} }
Err(ProfileError::NotSupported.into()) Err(ProfileError::NotSupported.into())
} }
pub async fn update_profiles_from_config(&self) {
self.fan_curves.lock().await.balanced = self.config.lock().await.balanced.clone();
self.fan_curves.lock().await.performance = self.config.lock().await.performance.clone();
self.fan_curves.lock().await.quiet = self.config.lock().await.quiet.clone();
}
/// Because this locks both config and fan_curves, it means nothing else can
/// hold a lock across this function call. Stupid choice to do this and
/// needs to be fixed.
pub async fn update_config_from_profiles(&self) {
self.config.lock().await.balanced = self.fan_curves.lock().await.balanced.clone();
self.config.lock().await.performance = self.fan_curves.lock().await.performance.clone();
self.config.lock().await.quiet = self.fan_curves.lock().await.quiet.clone();
}
} }
#[dbus_interface(name = "org.asuslinux.Daemon")] #[dbus_interface(name = "org.asuslinux.Daemon")]
@@ -132,15 +113,16 @@ impl CtrlFanCurveZbus {
profile: ThrottlePolicy, profile: ThrottlePolicy,
enabled: bool, enabled: bool,
) -> zbus::fdo::Result<()> { ) -> zbus::fdo::Result<()> {
self.fan_curves self.config
.lock() .lock()
.await .await
.profiles
.set_profile_curves_enabled(profile, enabled); .set_profile_curves_enabled(profile, enabled);
self.fan_curves self.config
.lock() .lock()
.await .await
.profiles
.write_profile_curve_to_platform(profile, &mut find_fan_curve_node()?)?; .write_profile_curve_to_platform(profile, &mut find_fan_curve_node()?)?;
self.update_config_from_profiles().await;
self.config.lock().await.write(); self.config.lock().await.write();
Ok(()) Ok(())
} }
@@ -153,15 +135,16 @@ impl CtrlFanCurveZbus {
fan: FanCurvePU, fan: FanCurvePU,
enabled: bool, enabled: bool,
) -> zbus::fdo::Result<()> { ) -> zbus::fdo::Result<()> {
self.fan_curves self.config
.lock() .lock()
.await .await
.profiles
.set_profile_fan_curve_enabled(profile, fan, enabled); .set_profile_fan_curve_enabled(profile, fan, enabled);
self.fan_curves self.config
.lock() .lock()
.await .await
.profiles
.write_profile_curve_to_platform(profile, &mut find_fan_curve_node()?)?; .write_profile_curve_to_platform(profile, &mut find_fan_curve_node()?)?;
self.update_config_from_profiles().await;
self.config.lock().await.write(); self.config.lock().await.write();
Ok(()) Ok(())
} }
@@ -172,9 +155,10 @@ impl CtrlFanCurveZbus {
profile: ThrottlePolicy, profile: ThrottlePolicy,
) -> zbus::fdo::Result<Vec<CurveData>> { ) -> zbus::fdo::Result<Vec<CurveData>> {
let curve = self let curve = self
.fan_curves .config
.lock() .lock()
.await .await
.profiles
.get_fan_curves_for(profile) .get_fan_curves_for(profile)
.to_vec(); .to_vec();
Ok(curve) Ok(curve)
@@ -187,15 +171,16 @@ impl CtrlFanCurveZbus {
profile: ThrottlePolicy, profile: ThrottlePolicy,
curve: CurveData, curve: CurveData,
) -> zbus::fdo::Result<()> { ) -> zbus::fdo::Result<()> {
self.fan_curves self.config
.lock() .lock()
.await .await
.profiles
.save_fan_curve(curve, profile)?; .save_fan_curve(curve, profile)?;
self.fan_curves self.config
.lock() .lock()
.await .await
.profiles
.write_profile_curve_to_platform(profile, &mut find_fan_curve_node()?)?; .write_profile_curve_to_platform(profile, &mut find_fan_curve_node()?)?;
self.update_config_from_profiles().await;
self.config.lock().await.write(); self.config.lock().await.write();
Ok(()) Ok(())
} }
@@ -207,11 +192,11 @@ impl CtrlFanCurveZbus {
/// read only for the currently active profile. /// read only for the currently active profile.
async fn set_active_curve_to_defaults(&mut self) -> zbus::fdo::Result<()> { async fn set_active_curve_to_defaults(&mut self) -> zbus::fdo::Result<()> {
let active = self.platform.get_throttle_thermal_policy()?; let active = self.platform.get_throttle_thermal_policy()?;
self.fan_curves self.config
.lock() .lock()
.await .await
.profiles
.set_active_curve_to_defaults(active.into(), &mut find_fan_curve_node()?)?; .set_active_curve_to_defaults(active.into(), &mut find_fan_curve_node()?)?;
self.update_config_from_profiles().await;
self.config.lock().await.write(); self.config.lock().await.write();
Ok(()) Ok(())
} }
@@ -225,13 +210,13 @@ impl CtrlFanCurveZbus {
let active = self.platform.get_throttle_thermal_policy()?; let active = self.platform.get_throttle_thermal_policy()?;
self.platform.set_throttle_thermal_policy(profile.into())?; self.platform.set_throttle_thermal_policy(profile.into())?;
self.fan_curves self.config
.lock() .lock()
.await .await
.profiles
.set_active_curve_to_defaults(active.into(), &mut find_fan_curve_node()?)?; .set_active_curve_to_defaults(active.into(), &mut find_fan_curve_node()?)?;
self.platform.set_throttle_thermal_policy(active)?; self.platform.set_throttle_thermal_policy(active)?;
self.update_config_from_profiles().await;
self.config.lock().await.write(); self.config.lock().await.write();
Ok(()) Ok(())
} }
@@ -252,7 +237,7 @@ impl CtrlTask for CtrlFanCurveZbus {
let watch_throttle_thermal_policy = self.platform.monitor_throttle_thermal_policy()?; let watch_throttle_thermal_policy = self.platform.monitor_throttle_thermal_policy()?;
let platform = self.platform.clone(); let platform = self.platform.clone();
let config = self.config.clone(); let config = self.config.clone();
let fan_curves = self.fan_curves.clone(); let fan_curves = self.config.clone();
tokio::spawn(async move { tokio::spawn(async move {
let mut buffer = [0; 32]; let mut buffer = [0; 32];
@@ -266,6 +251,7 @@ impl CtrlTask for CtrlFanCurveZbus {
fan_curves fan_curves
.lock() .lock()
.await .await
.profiles
.write_profile_curve_to_platform( .write_profile_curve_to_platform(
profile.into(), profile.into(),
&mut find_fan_curve_node().unwrap(), &mut find_fan_curve_node().unwrap(),
@@ -294,8 +280,10 @@ impl crate::Reloadable for CtrlFanCurveZbus {
// initialises the data from system read and we need to save it // initialises the data from system read and we need to save it
// after // after
loop { loop {
if let Ok(mut curves) = self.fan_curves.try_lock() { if let Ok(mut config) = self.config.try_lock() {
curves.write_profile_curve_to_platform(active, &mut device)?; config
.profiles
.write_profile_curve_to_platform(active, &mut device)?;
break; break;
} }
} }