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

manager: Just don't call start-/stop_tracing if should_trace is false

Browse source
This commit is contained in:
Vicki Pfau 2024-03-25 16:15:14 -07:00
parent de55ef31ce
commit ebd89f4f72
1 changed files with 25 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

55
src/manager.rs
View file

@ -146,11 +146,7 @@ async fn restart_iwd() -> Result<bool> {
}
}
async fn stop_tracing(should_trace: bool) -> Result<bool> {
if !should_trace {
return Ok(true);
}
async fn stop_tracing() -> Result<bool> {
// Stop tracing and extract ring buffer to disk for capture
run_script("stop tracing", "trace-cmd", &["stop"]).await?;
// stop tracing worked
@ -162,11 +158,7 @@ async fn stop_tracing(should_trace: bool) -> Result<bool> {
.await
}
async fn start_tracing(buffer_size: u32, should_trace: bool) -> Result<bool> {
if !should_trace {
return Ok(true);
}
async fn start_tracing(buffer_size: u32) -> Result<bool> {
// Start tracing
let size_str = format!("{}", buffer_size);
run_script(
@ -410,16 +402,18 @@ impl SMManager {
Ok(WifiDebugMode::Off) => {
// If mode is 0 disable wifi debug mode
// Stop any existing trace and flush to disk.
let result = match stop_tracing(self.should_trace).await {
Ok(result) => result,
Err(message) => {
error!("stop_tracing command got an error: {message}");
if self.should_trace {
let result = match stop_tracing().await {
Ok(result) => result,
Err(message) => {
error!("stop_tracing command got an error: {message}");
return false;
}
};
if !result {
error!("stop_tracing command returned non-zero");
return false;
}
};
if !result {
error!("stop_tracing command returned non-zero");
return false;
}
// Stop_tracing was successful
if let Err(message) = setup_iwd_config(false).await {
@ -466,21 +460,22 @@ impl SMManager {
return false;
}
// restart_iwd worked
let value = match start_tracing(buffer_size, self.should_trace).await {
Ok(value) => value,
Err(message) => {
error!("start_tracing got an error: {message}");
if self.should_trace {
let value = match start_tracing(buffer_size).await {
Ok(value) => value,
Err(message) => {
error!("start_tracing got an error: {message}");
return false;
}
};
if !value {
// start_tracing failed
error!("start_tracing failed");
return false;
}
};
if value {
// start_tracing worked
self.wifi_debug_mode = WifiDebugMode::On;
} else {
// start_tracing failed
error!("start_tracing failed");
return false;
}
// start_tracing worked
self.wifi_debug_mode = WifiDebugMode::On;
}
Err(_) => {
// Invalid mode requested, more coming later, but add this catch-all for now