From 5a5ce94a2b161d504d6051c99ff0145c12c052d1 Mon Sep 17 00:00:00 2001 From: Klimenty Tsoutsman Date: Fri, 8 Sep 2023 23:43:36 +1000 Subject: [PATCH] Remove `rq_access_eval` Signed-off-by: Klimenty Tsoutsman --- Cargo.lock | 12 ---- applications/rq_access_eval/Cargo.toml | 13 ----- applications/rq_access_eval/src/lib.rs | 79 -------------------------- theseus_features/Cargo.toml | 2 - 4 files changed, 106 deletions(-) delete mode 100644 applications/rq_access_eval/Cargo.toml delete mode 100644 applications/rq_access_eval/src/lib.rs diff --git a/Cargo.lock b/Cargo.lock index d70202909a..d9c6fef030 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3021,17 +3021,6 @@ dependencies = [ "task", ] -[[package]] -name = "rq_access_eval" -version = "0.1.0" -dependencies = [ - "app_io", - "cpu", - "getopts", - "irq_safety", - "time", -] - [[package]] name = "rq_eval" version = "0.1.0" @@ -3978,7 +3967,6 @@ dependencies = [ "raw_mode", "rm", "rq", - "rq_access_eval", "rq_eval", "scheduler_eval", "seconds_counter", diff --git a/applications/rq_access_eval/Cargo.toml b/applications/rq_access_eval/Cargo.toml deleted file mode 100644 index 8b192a0fe3..0000000000 --- a/applications/rq_access_eval/Cargo.toml +++ /dev/null @@ -1,13 +0,0 @@ -[package] -name = "rq_access_eval" -version = "0.1.0" -authors = ["Klim Tsoutsman "] -description = "Run queue access benchmark" -edition = "2021" - -[dependencies] -app_io = { path = "../../kernel/app_io" } -cpu = { path = "../../kernel/cpu" } -getopts = "0.2" -irq_safety = { git = "https://github.com/theseus-os/irq_safety" } -time = { path = "../../kernel/time" } diff --git a/applications/rq_access_eval/src/lib.rs b/applications/rq_access_eval/src/lib.rs deleted file mode 100644 index a9a0fe62fd..0000000000 --- a/applications/rq_access_eval/src/lib.rs +++ /dev/null @@ -1,79 +0,0 @@ -#![no_std] - -// extern crate alloc; - -// use alloc::{string::String, vec::Vec}; -// use app_io::println; -// use time::{now, Duration, Monotonic}; - -// pub fn main(args: Vec) -> isize { -// let guard = irq_safety::hold_interrupts(); -// let mut options = getopts::Options::new(); -// options -// .optflag("h", "help", "Display this message") -// .optflag("l", "least-busy", "Get the least busy core") -// .optopt("c", "core", "Get 's runqueue", "") -// .optopt("n", "num", "Perform iterations", ""); - -// let matches = match options.parse(args) { -// Ok(matches) => matches, -// Err(e) => { -// println!("{}", e); -// print_usage(options); -// return 1; -// } -// }; - -// let least_busy = matches.opt_present("l"); -// let core = matches.opt_get::("c").expect("failed to parse core"); - -// if least_busy && core.is_some() { -// panic!("both the least-busy and core flags can't be specified"); -// } - -// let num = matches -// .opt_get_default("n", 1_000_000) -// .expect("failed to parse num"); - -// let duration = if least_busy { -// run( -// |_| { -// runqueue::get_least_busy_core(); -// }, -// num, -// ) -// } else if let Some(core) = core { -// run( -// |_| { -// runqueue::get_runqueue(core); -// }, -// num, -// ) -// } else { -// let cpu_count = cpu::cpu_count(); -// run( -// |count| { -// runqueue::get_runqueue((count % cpu_count) as u8); -// }, -// num, -// ) -// }; -// drop(guard); - -// println!("time: {:#?}", duration); - -// 0 -// } - -// fn run(f: impl Fn(u32), num: u32) -> Duration { -// let start = now::(); -// for i in 0..num { -// f(i); -// } -// now::().duration_since(start) -// } - -// fn print_usage(options: getopts::Options) { -// let brief = alloc::format!("Usage: {} [OPTIONS]", env!("CARGO_CRATE_NAME")); -// println!("{}", options.usage(&brief)); -// } diff --git a/theseus_features/Cargo.toml b/theseus_features/Cargo.toml index b4f504aea4..22d317c4f2 100644 --- a/theseus_features/Cargo.toml +++ b/theseus_features/Cargo.toml @@ -75,7 +75,6 @@ tls_test = { path = "../applications/tls_test", optional = true } bm = { path = "../applications/bm", optional = true } channel_eval = { path = "../applications/channel_eval", optional = true } heap_eval = { path = "../applications/heap_eval", optional = true } -rq_access_eval = { path = "../applications/rq_access_eval", optional = true } rq_eval = { path = "../applications/rq_eval", optional = true } scheduler_eval = { path = "../applications/scheduler_eval", optional = true } @@ -136,7 +135,6 @@ theseus_benchmarks = [ "bm", "channel_eval", "heap_eval", - "rq_access_eval", "rq_eval", "scheduler_eval", ]