Version bump to v0.3.2

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "hardware-tests"
 description = "Bit Goblin PC hardware test suite."
-version = "0.3.0"
+version = "0.3.2"
 edition = "2021"
 readme = "README.md"
 license = "BSD 2-Clause"

src/benchmarks/network.rs

@@ -4,13 +4,47 @@ use std::{fs,process};
 use crate::text;
 
 // ping a host
-pub fn ping_host(host: &str, count: &u16) {
-    println!("Pinging host {}, {} times.", host, count);
+pub fn ping_host(address: &str, count: &u16) {
+    println!("Pinging host {}, {} times.", address, count);
+
+    let mut count_arg = "-c";
+    if cfg!(windows) {
+        count_arg = "-n";
+    }
 
     // run the ping command
     let output = process::Command::new("ping")
-        .arg(host)
-        .arg(format!("-c {}", count))
+        .arg(address)
+        .arg(count_arg)
+        .arg(format!("{}", count))
+        .output()
+        .expect("Failed to execute command");
+
+    // check that the command succeeded
+    assert!(output.status.success());
+
+    // grab the ping results from stdout
+    let results_raw = &String::from_utf8_lossy(&output.stdout);
+    let results = text::format::trim_output(results_raw, 4);
+    for line in results {
+        println!("{}", line);
+    }
+}
+
+// network jitter test
+pub fn jitter_test(address: &str, count: &u16) {
+    println!("Pinging host {}, {} times to determine network jitter.", address, count);
+
+    let mut count_arg = "-c";
+    if cfg!(windows) {
+        count_arg = "-n";
+    }
+
+    // run the ping command
+    let output = process::Command::new("ping")
+        .arg(address)
+        .arg(count_arg)
+        .arg(format!("{}", count))
         .output()
         .expect("Failed to execute command");
 

src/main.rs

@@ -11,8 +11,8 @@ struct Cli {
     #[clap(subcommand)]
     command: Commands,
 
-    #[clap(short = 'l', long, default_value_t = 1, help = "Number of times to run test. Default = 1", global = true)]
-    loopcount: u8,
+    #[clap(short = 'i', long, default_value_t = 1, help = "Number of times to run test. Default = 1", global = true)]
+    iterations: u8,
 }
 
 #[derive(Subcommand)]
@@ -39,7 +39,9 @@ enum CpuCommands {
     // CPU stress test subcommand
     #[clap(name = "stress", about = "Stress test the CPU with math!")]
     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,
     },
 }
@@ -55,7 +57,7 @@ enum DiskCommands {
     // sequential disk read subcommand
     #[clap(name = "read_seq", about = "Sequential disk read speed test.")]
     ReadSeqTest {
-        #[clap(short = 'f', long, default_value_t = String::from("/tmp/disk-test.tmp"))]
+        #[clap(short = 't', long, default_value_t = String::from("/tmp/disk-test.tmp"))]
         tempfile: String,
         #[clap(short = 's', long, default_value_t = 15)]
         size: u8,
@@ -64,7 +66,7 @@ enum DiskCommands {
     // random disk read subcommand
     #[clap(name = "read_rand", about = "Random 4K disk read speed test.")]
     ReadRandTest {
-        #[clap(short = 'f', long, default_value_t = String::from("/tmp/disk-test.tmp"))]
+        #[clap(short = 't', long, default_value_t = String::from("/tmp/disk-test.tmp"))]
         tempfile: String,
         #[clap(short = 's', long, default_value_t = 15)]
         size: u8,
@@ -100,8 +102,17 @@ enum NetCommands {
     // ping subcommand
     #[clap(name = "ping", about = "Ping a host to determine network latency.")]
     Ping {
-        #[clap(short = 't', long, default_value_t = String::from("8.8.8.8"))]
-        host: String,
+        #[clap(short = 'a', long, default_value_t = String::from("8.8.8.8"))]
+        address: String,
+        #[clap(short = 'c', long, default_value_t = 30)]
+        count: u16,
+    },
+
+    // jitter subcommand
+    #[clap(name = "jitter", about = "Ping a host to determine network jitter.")]
+    Jitter {
+        #[clap(short = 'a', long, default_value_t = String::from("8.8.8.8"))]
+        address: String,
         #[clap(short = 'c', long, default_value_t = 30)]
         count: u16,
     },
@@ -111,7 +122,7 @@ enum NetCommands {
     Bandwidth {
         #[clap(short = 'd', long, default_value_t = String::from("https://www.bitgoblin.tech/hardware-tests/export-01.mp4"))]
         download: String,
-        #[clap(short = 'o', long, default_value_t = String::from("./tempfile"))]
+        #[clap(short = 't', long, default_value_t = String::from("/tmp/bw-test.tmp"))]
         output: String,
     },
 }
@@ -122,30 +133,30 @@ fn main() {
     // map subcommands back to the main command
     match &cli.command {
         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 {
             DiskCommands::ReadSeqTest { tempfile, size } => {
-                for i in 0..cli.loopcount {
+                for i in 0..cli.iterations {
                     println!("Test run number {}.", i + 1);
                     benchmarks::disk::disk_read_seq_test(tempfile, size);
                 }
             },
             DiskCommands::ReadRandTest { tempfile, size } => {
-                for i in 0..cli.loopcount {
+                for i in 0..cli.iterations {
                     println!("Test run number {}.", i + 1);
                     benchmarks::disk::disk_read_rand_test(tempfile, size);
                 }
             },
             DiskCommands::WriteSeqTest { tempfile, size } => {
-                for i in 0..cli.loopcount {
+                for i in 0..cli.iterations {
                     println!("Test run number {}.", i + 1);
                     benchmarks::disk::disk_write_seq_test(tempfile, size);
                 }
             },
             DiskCommands::WriteRandTest { tempfile, size } => {
-                for i in 0..cli.loopcount {
+                for i in 0..cli.iterations {
                     println!("Test run number {}.", i + 1);
                     benchmarks::disk::disk_write_rand_test(tempfile, size);
                 }
@@ -153,14 +164,20 @@ fn main() {
         }
 
         Commands::Net(args) => match &args.net_commands {
-            NetCommands::Ping { host, count } => {
-                for i in 0..cli.loopcount {
+            NetCommands::Ping { address, count } => {
+                for i in 0..cli.iterations {
                     println!("Test run number {}.", i + 1);
-                    benchmarks::network::ping_host(host, count);
+                    benchmarks::network::ping_host(address, count);
+                }
+            },
+            NetCommands::Jitter { address, count } => {
+                for i in 0..cli.iterations {
+                    println!("Test run number {}.", i + 1);
+                    benchmarks::network::jitter_test(address, count);
                 }
             },
             NetCommands::Bandwidth { download, output } => {
-                for i in 0..cli.loopcount {
+                for i in 0..cli.iterations {
                     println!("Test run number {}.", i + 1);
                     benchmarks::network::bandwidth_test(download, output);
                 }

src/stress/cpu.rs

@@ -1,28 +1,32 @@
-use std::thread;
+use std::{thread, time};
+use std::process::exit;
 use sysinfo::{System,SystemExt};
 
-pub fn cpu_stress_math(threads: usize) {
-	// fetch system information
-	let mut sys = System::new_all();
-	sys.refresh_all();
-	let num_cpus = sys.cpus().len();
+pub fn cpu_stress_math(runtime: u16, threads: usize) {
+    // fetch system information
+    let mut sys = System::new_all();
+    sys.refresh_all();
+    let num_cpus = sys.cpus().len();
 
-	let mut num_threads = threads;
-	if num_threads == 0 {
-		println!("Number of threads not specified, defaulting to CPU's thread count of {}.", num_cpus);
-		num_threads = num_cpus;
-	} else {
-		println!("Using specified thread count of {}", num_threads);
-	}
+    let mut num_threads = threads;
+    if num_threads == 0 {
+        println!("Number of threads not specified, defaulting to CPU's thread count of {}.", num_cpus);
+        num_threads = num_cpus;
+    } else {
+        println!("Using specified thread count of {}", num_threads);
+    }
 
-	for i in 1..num_threads {
-        println!("Spawning thread number {}", i);
+    for i in 0..num_threads {
+        println!("Spawning thread number {}", i + 1);
         thread::spawn (|| {
             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() {