power: Make sure to flush writes before dropping the files

This commit is contained in:
Vicki Pfau 2024-04-16 18:14:18 -07:00
parent e3122059e5
commit f004035f7f
2 changed files with 18 additions and 16 deletions

View file

@ -6,7 +6,9 @@
*/
use anyhow::{anyhow, bail, Error, Result};
use std::path::PathBuf;
use std::path::{Path, PathBuf};
use tokio::fs::File;
use tokio::io::AsyncWriteExt;
use tokio::signal::unix::{signal, SignalKind};
use tokio::task::JoinSet;
use tokio_util::sync::CancellationToken;
@ -76,6 +78,12 @@ pub fn path<S: AsRef<str>>(path: S) -> PathBuf {
.join(path.as_ref().trim_start_matches('/'))
}
pub async fn write_synced<P: AsRef<Path>>(path: P, bytes: &[u8]) -> Result<()> {
let mut file = File::create(path.as_ref()).await?;
file.write_all(bytes).await?;
Ok(file.sync_data().await?)
}
pub fn read_comm(pid: u32) -> Result<String> {
let comm = std::fs::read_to_string(path(format!("/proc/{}/comm", pid)))?;
Ok(comm.trim_end().to_string())

View file

@ -12,7 +12,7 @@ use tokio::fs::{self, File};
use tokio::io::{AsyncBufReadExt, AsyncWriteExt, BufReader};
use tracing::error;
use crate::path;
use crate::{path, write_synced};
const GPU_HWMON_PREFIX: &str = "/sys/class/drm/card0/device/hwmon";
@ -84,17 +84,10 @@ pub async fn get_gpu_performance_level() -> Result<GPUPerformanceLevel> {
}
pub async fn set_gpu_performance_level(level: GPUPerformanceLevel) -> Result<()> {
let mut myfile = File::create(path(GPU_PERFORMANCE_LEVEL_PATH))
.await
.inspect_err(|message| error!("Error opening sysfs file for writing: {message}"))?;
let level: String = level.to_string();
myfile
.write_all(level.as_bytes())
write_synced(path(GPU_PERFORMANCE_LEVEL_PATH), level.as_bytes())
.await
.inspect_err(|message| error!("Error writing to sysfs file: {message}"))?;
Ok(())
.inspect_err(|message| error!("Error writing to sysfs file: {message}"))
}
pub async fn set_gpu_clocks(clocks: u32) -> Result<()> {
@ -111,17 +104,21 @@ pub async fn set_gpu_clocks(clocks: u32) -> Result<()> {
.write(data.as_bytes())
.await
.inspect_err(|message| error!("Error writing to sysfs file: {message}"))?;
myfile.flush().await?;
let data = format!("s 1 {clocks}\n");
myfile
.write(data.as_bytes())
.await
.inspect_err(|message| error!("Error writing to sysfs file: {message}"))?;
myfile.flush().await?;
myfile
.write("c\n".as_bytes())
.await
.inspect_err(|message| error!("Error writing to sysfs file: {message}"))?;
myfile.flush().await?;
Ok(())
}
@ -181,21 +178,18 @@ pub async fn set_tdp_limit(limit: u32) -> Result<()> {
let data = format!("{limit}000000");
let base = find_hwmon().await?;
let mut power1file = File::create(base.join(TDP_LIMIT1))
write_synced(base.join(TDP_LIMIT1), data.as_bytes())
.await
.inspect_err(|message| {
error!("Error opening sysfs power1_cap file for writing TDP limits {message}")
})?;
power1file
.write(data.as_bytes())
.await
.inspect_err(|message| error!("Error writing to power1_cap file: {message}"))?;
if let Ok(mut power2file) = File::create(base.join(TDP_LIMIT2)).await {
power2file
.write(data.as_bytes())
.await
.inspect_err(|message| error!("Error writing to power2_cap file: {message}"))?;
power2file.flush().await?;
}
Ok(())
}