RGBCube/superfreq
1
Fork 0
mirror of https://github.com/RGBCube/superfreq synced 2025-07-27 17:07:44 +00:00
Code Issues Activity

daemon: prevent busy loops via minimum polling interval

Browse source
This commit is contained in:
NotAShelf 2025-05-17 06:01:00 +03:00
parent ff4e6e69c8
commit f0932c64d9
No known key found for this signature in database
GPG key ID: 29D95B64378DB4BF
1 changed files with 21 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/daemon.rs
View file

@ -414,7 +414,11 @@ pub fn run_daemon(mut config: AppConfig, verbose: bool) -> Result<(), Box<dyn st
}; };
// Variables for adaptive polling // Variables for adaptive polling
let mut current_poll_interval = config.daemon.poll_interval_sec; // Mak sure that the poll interval is *never* zero in order to prevent a busy loop
let mut current_poll_interval = config.daemon.poll_interval_sec.max(1);
if config.daemon.poll_interval_sec == 0 {
warn!("Poll interval is set to zero in config, using 1s minimum to prevent a busy loop");
}
let mut system_history = SystemHistory::default(); let mut system_history = SystemHistory::default();
// Main loop // Main loop
@ -429,7 +433,12 @@ pub fn run_daemon(mut config: AppConfig, verbose: bool) -> Result<(), Box<dyn st
info!("Config file changed, updating configuration"); info!("Config file changed, updating configuration");
config = new_config; config = new_config;
// Reset polling interval after config change // Reset polling interval after config change
current_poll_interval = config.daemon.poll_interval_sec; current_poll_interval = config.daemon.poll_interval_sec.max(1);
if config.daemon.poll_interval_sec == 0 {
warn!(
"Poll interval is set to zero in updated config, using 1s minimum to prevent a busy loop"
);
}
// Mark this as a system event for adaptive polling // Mark this as a system event for adaptive polling
system_history.last_user_activity = Instant::now(); system_history.last_user_activity = Instant::now();
} }
@ -502,9 +511,12 @@ pub fn run_daemon(mut config: AppConfig, verbose: bool) -> Result<(), Box<dyn st
} else { } else {
// If adaptive polling is disabled, still apply battery-saving adjustment // If adaptive polling is disabled, still apply battery-saving adjustment
if config.daemon.throttle_on_battery && on_battery { if config.daemon.throttle_on_battery && on_battery {
let battery_multiplier = 2; // Poll half as often on battery let battery_multiplier = 2; // poll half as often on battery
current_poll_interval = (config.daemon.poll_interval_sec
* battery_multiplier) // We need to make sure `poll_interval_sec` is *at least* 1
// before multiplying.
let safe_interval = config.daemon.poll_interval_sec.max(1);
current_poll_interval = (safe_interval * battery_multiplier)
.min(config.daemon.max_poll_interval_sec); .min(config.daemon.max_poll_interval_sec);
debug!( debug!(
@ -512,7 +524,10 @@ pub fn run_daemon(mut config: AppConfig, verbose: bool) -> Result<(), Box<dyn st
); );
} else { } else {
// Use the configured poll interval // Use the configured poll interval
current_poll_interval = config.daemon.poll_interval_sec; current_poll_interval = config.daemon.poll_interval_sec.max(1);
if config.daemon.poll_interval_sec == 0 {
debug!("Using minimum poll interval of 1s instead of configured 0s");
}
} }
} }
} }