Tateisi/rcore-tutorial
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

user: add critical test for software-synchronous tests

Browse source
This commit is contained in:
DeathWish5 2021-12-23 15:25:06 +08:00
parent a0a6863368
commit 4262726f0b
3 changed files with 60 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

41
user/src/bin/peterson.rs
View file

@ -1,6 +1,7 @@
#![no_std]
#![no_main]
#![feature(core_intrinsics)]
#![feature(asm)]
#[macro_use]
extern crate user_lib;
@ -8,38 +9,55 @@ extern crate alloc;
extern crate core;
use user_lib::{thread_create, waittid, exit, sleep};
use core::sync::atomic::{AtomicUsize, Ordering};
use alloc::vec::Vec;
const N: usize = 3;
static mut TURN: usize = 0;
static mut FLAG: [bool; 2] = [false; 2];
static GUARD: AtomicUsize = AtomicUsize::new(0);
fn critical_test_enter() {
assert_eq!(GUARD.fetch_add(1, Ordering::SeqCst), 0);
}
fn critical_test_claim() {
assert_eq!(GUARD.load(Ordering::SeqCst), 1);
}
fn critical_test_exit() {
assert_eq!(GUARD.fetch_sub(1, Ordering::SeqCst), 1);
}
fn peterson_enter_critical(id: usize, peer_id: usize) {
println!("Thread {} try enter", id);
store!(&FLAG[id], true);
store!(&TURN, peer_id);
println!("Thread[{}] try enter", id);
vstore!(&FLAG[id], true);
vstore!(&TURN, peer_id);
memory_fence!();
while load!(&FLAG[peer_id]) && load!(&TURN) == peer_id {
println!("Thread {} enter fail", id);
while vload!(&FLAG[peer_id]) && vload!(&TURN) == peer_id {
println!("Thread[{}] enter fail", id);
sleep(1);
println!("Thread {} retry enter", id);
println!("Thread[{}] retry enter", id);
}
println!("Thread {} enter", id);
println!("Thread[{}] enter", id);
}
fn peterson_exit_critical(id: usize) {
store!(&FLAG[id], false);
println!("Thread {} exit", id);
vstore!(&FLAG[id], false);
println!("Thread[{}] exit", id);
}
pub fn thread_fn(id: usize) -> ! {
println!("Thread {} init.", id);
println!("Thread[{}] init.", id);
let peer_id: usize = id ^ 1;
for _ in 0..N {
peterson_enter_critical(id, peer_id);
critical_test_enter();
for _ in 0..3 {
critical_test_claim();
sleep(2);
}
critical_test_exit();
peterson_exit_critical(id);
}
exit(0)
@ -49,9 +67,10 @@ pub fn thread_fn(id: usize) -> ! {
pub fn main() -> i32 {
let mut v = Vec::new();
v.push(thread_create(thread_fn as usize, 0));
v.push(thread_create(thread_fn as usize, 1));
// v.push(thread_create(thread_fn as usize, 1));
for tid in v.iter() {
let exit_code = waittid(*tid as usize);
assert_eq!(exit_code, 0, "thread conflict happened!");
println!("thread#{} exited with code {}", tid, exit_code);
}
println!("main thread exited.");