Added a runtime parameter to the CPU stress test to automatically limit how long it runs
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful

This commit is contained in:
Gregory Ballantine 2022-08-17 15:28:11 -04:00
parent 360ef2f959
commit 132a0ee501
2 changed files with 25 additions and 19 deletions

View File

@ -39,7 +39,9 @@ enum CpuCommands {
// CPU stress test subcommand // CPU stress test subcommand
#[clap(name = "stress", about = "Stress test the CPU with math!")] #[clap(name = "stress", about = "Stress test the CPU with math!")]
StressTest { StressTest {
#[clap(short = 't', long, default_value_t = 0, help = "Number of threads to use; defaults to CPU's max thread count.")] #[clap(short = 'r', long, default_value_t = 5, help = "Length of time (in minutes) to run the stress test. Defaults to 5")]
runtime: u16,
#[clap(short = 't', long, default_value_t = 0, help = "Number of threads to use; defaults to CPU's max thread count. Defaults to 0 (automatic)")]
threads: usize, threads: usize,
}, },
} }
@ -122,7 +124,7 @@ fn main() {
// map subcommands back to the main command // map subcommands back to the main command
match &cli.command { match &cli.command {
Commands::Cpu(args) => match &args.cpu_commands { Commands::Cpu(args) => match &args.cpu_commands {
CpuCommands::StressTest { threads } => stress::cpu::cpu_stress_math(*threads), CpuCommands::StressTest { runtime, threads } => stress::cpu::cpu_stress_math(*runtime, *threads),
}, },
Commands::Disk(args) => match &args.disk_commands { Commands::Disk(args) => match &args.disk_commands {

View File

@ -1,28 +1,32 @@
use std::thread; use std::{thread, time};
use std::process::exit;
use sysinfo::{System,SystemExt}; use sysinfo::{System,SystemExt};
pub fn cpu_stress_math(threads: usize) { pub fn cpu_stress_math(runtime: u16, threads: usize) {
// fetch system information // fetch system information
let mut sys = System::new_all(); let mut sys = System::new_all();
sys.refresh_all(); sys.refresh_all();
let num_cpus = sys.cpus().len(); let num_cpus = sys.cpus().len();
let mut num_threads = threads; let mut num_threads = threads;
if num_threads == 0 { if num_threads == 0 {
println!("Number of threads not specified, defaulting to CPU's thread count of {}.", num_cpus); println!("Number of threads not specified, defaulting to CPU's thread count of {}.", num_cpus);
num_threads = num_cpus; num_threads = num_cpus;
} else { } else {
println!("Using specified thread count of {}", num_threads); println!("Using specified thread count of {}", num_threads);
} }
for i in 1..num_threads { for i in 0..num_threads {
println!("Spawning thread number {}", i); println!("Spawning thread number {}", i + 1);
thread::spawn (|| { thread::spawn (|| {
worker(); worker();
}); });
} }
println!("Using main as last thread");
worker(); println!("Sleeping main thread for the allotted runtime of {} minute(s).", runtime);
let duration = time::Duration::from_secs((runtime * 60).into());
thread::sleep(duration);
exit(0);
} }
fn worker() { fn worker() {