mohr/nexosim
1
0
Fork 0
forked from ROMEO/nexosim
Code Pull Requests Activity

Make execution failible, impl deadlock detection

Browse Source 
TODO: return the list of models involved in a deadlock.

Note that Many execution errors are not implemented at all at the
moment and will need separate PRs, namely:
- Terminated
- ModelError
- Panic
This commit is contained in:
Serge Barral
2024-10-20 12:35:44 +02:00
parent e7889c8e9b
commit 1cfaa00f9e
22 changed files with 556 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
asynchronix/tests/model_scheduling.rs
View File

@ -38,13 +38,13 @@ fn model_schedule_event() {
let addr = mbox.address();
let t0 = MonotonicTime::EPOCH;
let mut simu = SimInit::new().add_model(model, mbox, "").init(t0);
let mut simu = SimInit::new().add_model(model, mbox, "").init(t0).unwrap();
simu.process_event(TestModel::trigger, (), addr);
simu.step();
simu.process_event(TestModel::trigger, (), addr).unwrap();
simu.step().unwrap();
assert_eq!(simu.time(), t0 + Duration::from_secs(2));
assert!(output.next().is_some());
simu.step();
simu.step().unwrap();
assert!(output.next().is_none());
}
@ -93,13 +93,13 @@ fn model_cancel_future_keyed_event() {
let addr = mbox.address();
let t0 = MonotonicTime::EPOCH;
let mut simu = SimInit::new().add_model(model, mbox, "").init(t0);
let mut simu = SimInit::new().add_model(model, mbox, "").init(t0).unwrap();
simu.process_event(TestModel::trigger, (), addr);
simu.step();
simu.process_event(TestModel::trigger, (), addr).unwrap();
simu.step().unwrap();
assert_eq!(simu.time(), t0 + Duration::from_secs(1));
assert_eq!(output.next(), Some(1));
simu.step();
simu.step().unwrap();
assert_eq!(simu.time(), t0 + Duration::from_secs(1));
assert!(output.next().is_none());
}
@ -149,14 +149,14 @@ fn model_cancel_same_time_keyed_event() {
let addr = mbox.address();
let t0 = MonotonicTime::EPOCH;
let mut simu = SimInit::new().add_model(model, mbox, "").init(t0);
let mut simu = SimInit::new().add_model(model, mbox, "").init(t0).unwrap();
simu.process_event(TestModel::trigger, (), addr);
simu.step();
simu.process_event(TestModel::trigger, (), addr).unwrap();
simu.step().unwrap();
assert_eq!(simu.time(), t0 + Duration::from_secs(2));
assert_eq!(output.next(), Some(1));
assert!(output.next().is_none());
simu.step();
simu.step().unwrap();
assert!(output.next().is_none());
}
@ -192,13 +192,13 @@ fn model_schedule_periodic_event() {
let addr = mbox.address();
let t0 = MonotonicTime::EPOCH;
let mut simu = SimInit::new().add_model(model, mbox, "").init(t0);
let mut simu = SimInit::new().add_model(model, mbox, "").init(t0).unwrap();
simu.process_event(TestModel::trigger, (), addr);
simu.process_event(TestModel::trigger, (), addr).unwrap();
// Move to the next events at t0 + 2s + k*3s.
for k in 0..10 {
simu.step();
simu.step().unwrap();
assert_eq!(
simu.time(),
t0 + Duration::from_secs(2) + k * Duration::from_secs(3)
@ -243,16 +243,16 @@ fn model_cancel_periodic_event() {
let addr = mbox.address();
let t0 = MonotonicTime::EPOCH;
let mut simu = SimInit::new().add_model(model, mbox, "").init(t0);
let mut simu = SimInit::new().add_model(model, mbox, "").init(t0).unwrap();
simu.process_event(TestModel::trigger, (), addr);
simu.process_event(TestModel::trigger, (), addr).unwrap();
simu.step();
simu.step().unwrap();
assert_eq!(simu.time(), t0 + Duration::from_secs(2));
assert!(output.next().is_some());
assert!(output.next().is_none());
simu.step();
simu.step().unwrap();
assert_eq!(simu.time(), t0 + Duration::from_secs(2));
assert!(output.next().is_none());
}