andrey/rCore-Tutorial-v3
1
0
Fork 0
mirror of https://github.com/rcore-os/rCore-Tutorial-v3.git synced 2024-11-23 09:56:24 +04:00
Code Issues Projects Releases Wiki Activity

Update race_adder tests

Browse Source
This commit is contained in:
Yifan Wu 2023-01-01 22:05:36 +08:00
parent e707679c13
commit 82b40b6f3d
6 changed files with 27 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
user/src/bin/race_adder.rs
View File

@ -9,7 +9,7 @@ use alloc::vec::Vec;
use user_lib::{exit, get_time, thread_create, waittid};
static mut A: usize = 0;
const PER_THREAD: usize = 1000;
const PER_THREAD: usize = 10000;
const THREAD_COUNT: usize = 16;
unsafe fn f() -> ! {
@ -32,9 +32,8 @@ pub fn main() -> i32 {
for _ in 0..THREAD_COUNT {
v.push(thread_create(f as usize, 0) as usize);
}
let mut time_cost = Vec::new();
for tid in v.iter() {
time_cost.push(waittid(*tid));
for tid in v.into_iter() {
waittid(tid);
}
println!("time cost is {}ms", get_time() - start);
assert_eq!(unsafe { A }, PER_THREAD * THREAD_COUNT);

27
user/src/bin/race_adder_arg.rs
View File

@ -10,15 +10,15 @@ use alloc::vec::Vec;
use user_lib::{exit, get_time, thread_create, waittid};
static mut A: usize = 0;
const PER_THREAD: usize = 1000;
const PER_THREAD: usize = 10000;
const THREAD_COUNT: usize = 16;
unsafe fn f(count: usize) -> ! {
unsafe fn f() -> ! {
let mut t = 2usize;
for _ in 0..PER_THREAD {
let a = &mut A as *mut usize;
let cur = a.read_volatile();
for _ in 0..count {
for _ in 0..500 {
t = t * t % 10007;
}
a.write_volatile(cur + 1);
@ -28,26 +28,23 @@ unsafe fn f(count: usize) -> ! {
#[no_mangle]
pub fn main(argc: usize, argv: &[&str]) -> i32 {
let count: usize;
if argc == 1 {
count = THREAD_COUNT;
} else if argc == 2 {
count = argv[1].to_string().parse::<usize>().unwrap();
} else {
let mut thread_count = THREAD_COUNT;
if argc == 2 {
thread_count = argv[1].to_string().parse::<usize>().unwrap();
} else if argc != 1 {
println!("ERROR in argv");
exit(-1);
}
let start = get_time();
let mut v = Vec::new();
for _ in 0..THREAD_COUNT {
v.push(thread_create(f as usize, count) as usize);
for _ in 0..thread_count {
v.push(thread_create(f as usize, 0) as usize);
}
let mut time_cost = Vec::new();
for tid in v.iter() {
time_cost.push(waittid(*tid));
for tid in v.into_iter() {
waittid(tid);
}
println!("time cost is {}ms", get_time() - start);
assert_eq!(unsafe { A }, PER_THREAD * THREAD_COUNT);
assert_eq!(unsafe { A }, PER_THREAD * thread_count);
0
}

7
user/src/bin/race_adder_atomic.rs
View File

@ -11,7 +11,7 @@ use user_lib::{exit, get_time, thread_create, waittid, yield_};
static mut A: usize = 0;
static OCCUPIED: AtomicBool = AtomicBool::new(false);
const PER_THREAD: usize = 1000;
const PER_THREAD: usize = 10000;
const THREAD_COUNT: usize = 16;
unsafe fn f() -> ! {
@ -41,9 +41,8 @@ pub fn main() -> i32 {
for _ in 0..THREAD_COUNT {
v.push(thread_create(f as usize, 0) as usize);
}
let mut time_cost = Vec::new();
for tid in v.iter() {
time_cost.push(waittid(*tid));
for tid in v.into_iter() {
waittid(tid);
}
println!("time cost is {}ms", get_time() - start);
assert_eq!(unsafe { A }, PER_THREAD * THREAD_COUNT);

7
user/src/bin/race_adder_loop.rs
View File

@ -10,7 +10,7 @@ use user_lib::{exit, get_time, thread_create, waittid, yield_};
static mut A: usize = 0;
static mut OCCUPIED: bool = false;
const PER_THREAD: usize = 1000;
const PER_THREAD: usize = 10000;
const THREAD_COUNT: usize = 16;
unsafe fn f() -> ! {
@ -41,9 +41,8 @@ pub fn main() -> i32 {
for _ in 0..THREAD_COUNT {
v.push(thread_create(f as usize, 0) as usize);
}
let mut time_cost = Vec::new();
for tid in v.iter() {
time_cost.push(waittid(*tid));
for tid in v.into_iter() {
waittid(tid);
}
println!("time cost is {}ms", get_time() - start);
assert_eq!(unsafe { A }, PER_THREAD * THREAD_COUNT);

7
user/src/bin/race_adder_mutex_blocking.rs
View File

@ -10,7 +10,7 @@ use user_lib::{exit, get_time, thread_create, waittid};
use user_lib::{mutex_blocking_create, mutex_lock, mutex_unlock};
static mut A: usize = 0;
const PER_THREAD: usize = 1000;
const PER_THREAD: usize = 10000;
const THREAD_COUNT: usize = 16;
unsafe fn f() -> ! {
@ -36,9 +36,8 @@ pub fn main() -> i32 {
for _ in 0..THREAD_COUNT {
v.push(thread_create(f as usize, 0) as usize);
}
let mut time_cost = Vec::new();
for tid in v.iter() {
time_cost.push(waittid(*tid));
for tid in v.into_iter() {
waittid(tid);
}
println!("time cost is {}ms", get_time() - start);
assert_eq!(unsafe { A }, PER_THREAD * THREAD_COUNT);

7
user/src/bin/race_adder_mutex_spin.rs
View File

@ -10,7 +10,7 @@ use user_lib::{exit, get_time, thread_create, waittid};
use user_lib::{mutex_create, mutex_lock, mutex_unlock};
static mut A: usize = 0;
const PER_THREAD: usize = 1000;
const PER_THREAD: usize = 10000;
const THREAD_COUNT: usize = 16;
unsafe fn f() -> ! {
@ -36,9 +36,8 @@ pub fn main() -> i32 {
for _ in 0..THREAD_COUNT {
v.push(thread_create(f as usize, 0) as usize);
}
let mut time_cost = Vec::new();
for tid in v.iter() {
time_cost.push(waittid(*tid));
for tid in v.into_iter() {
waittid(tid);
}
println!("time cost is {}ms", get_time() - start);
assert_eq!(unsafe { A }, PER_THREAD * THREAD_COUNT);