archives/steamos-manager
archives/steamos-manager
2
0
Fork 1
mirror of https://gitlab.steamos.cloud/holo/steamos-manager.git synced 2025-07-05 14:10:34 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

manager: Use anyhow::ensure

Browse source
This commit is contained in:
Vicki Pfau 2024-03-20 18:23:28 -07:00
parent 87ef532ce4
commit 6f1f1c032c
1 changed files with 7 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/manager.rs
View file

@ -24,7 +24,7 @@
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/ */
use anyhow::{Error, Result}; use anyhow::{ensure, Result};
use std::{ffi::OsStr, fmt, fs}; use std::{ffi::OsStr, fmt, fs};
use tokio::{fs::File, io::AsyncWriteExt, process::Command}; use tokio::{fs::File, io::AsyncWriteExt, process::Command};
use tracing::{error, warn}; use tracing::{error, warn};
@ -201,9 +201,10 @@ async fn set_gpu_performance_level(level: i32) -> Result<()> {
// Levels are defined below // Levels are defined below
// return true if able to write, false otherwise or if level is out of range, etc. // return true if able to write, false otherwise or if level is out of range, etc.
let levels = ["auto", "low", "high", "manual", "peak_performance"]; let levels = ["auto", "low", "high", "manual", "peak_performance"];
if level < 0 || level >= levels.len() as i32 { ensure!(
return Err(Error::msg("Invalid performance level")); level >= 0 && level < levels.len() as i32,
} "Invalid performance level"
);
let mut myfile = File::create(GPU_PERFORMANCE_LEVEL_PATH) let mut myfile = File::create(GPU_PERFORMANCE_LEVEL_PATH)
.await .await
@ -219,9 +220,7 @@ async fn set_gpu_performance_level(level: i32) -> Result<()> {
async fn set_gpu_clocks(clocks: i32) -> Result<()> { async fn set_gpu_clocks(clocks: i32) -> Result<()> {
// Set GPU clocks to given value valid between 200 - 1600 // Set GPU clocks to given value valid between 200 - 1600
// Only used when GPU Performance Level is manual, but write whenever called. // Only used when GPU Performance Level is manual, but write whenever called.
if !(200..=1600).contains(&clocks) { ensure!((200..=1600).contains(&clocks), "Invalid clocks");
return Err(Error::msg("Invalid clocks"));
}
let mut myfile = File::create(GPU_CLOCKS_PATH) let mut myfile = File::create(GPU_CLOCKS_PATH)
.await .await
@ -249,9 +248,7 @@ async fn set_gpu_clocks(clocks: i32) -> Result<()> {
async fn set_tdp_limit(limit: i32) -> Result<()> { async fn set_tdp_limit(limit: i32) -> Result<()> {
// Set TDP limit given if within range (3-15) // Set TDP limit given if within range (3-15)
// Returns false on error or out of range // Returns false on error or out of range
if !(3..=15).contains(&limit) { ensure!((3..=15).contains(&limit), "Invalid limit");
return Err(Error::msg("Invalid limit"));
}
let mut power1file = File::create(POWER1_CAP_PATH).await.inspect_err(|message| { let mut power1file = File::create(POWER1_CAP_PATH).await.inspect_err(|message| {
error!("Error opening sysfs power1_cap file for writing TDP limits {message}") error!("Error opening sysfs power1_cap file for writing TDP limits {message}")