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

Changes after review

Browse Source
This commit is contained in:
Jaŭhien Piatlicki 2025-01-15 13:38:27 +01:00
parent 4111d49295
commit beaefe1d9e
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
nexosim/src/simulation.rs
View File

@ -344,17 +344,15 @@ impl Simulation {
/// Runs the executor. /// Runs the executor.
fn run(&mut self) -> Result<(), ExecutionError> { fn run(&mut self) -> Result<(), ExecutionError> {
// Defensive programming, shouldn't happen
if !self.is_terminated && self.is_halted.load(Ordering::Relaxed) {
self.is_terminated = true;
return Err(ExecutionError::Halted);
}
// Defensive programming, shouldn't happen
if self.is_terminated { if self.is_terminated {
return Err(ExecutionError::Terminated); return Err(ExecutionError::Terminated);
} }
if self.is_halted.load(Ordering::Relaxed) {
self.is_terminated = true;
return Err(ExecutionError::Halted);
}
self.executor.run(self.timeout).map_err(|e| { self.executor.run(self.timeout).map_err(|e| {
self.is_terminated = true; self.is_terminated = true;
@ -409,15 +407,15 @@ impl Simulation {
&mut self, &mut self,
upper_time_bound: Option<MonotonicTime>, upper_time_bound: Option<MonotonicTime>,
) -> Result<Option<MonotonicTime>, ExecutionError> { ) -> Result<Option<MonotonicTime>, ExecutionError> {
if !self.is_terminated && self.is_halted.load(Ordering::Relaxed) {
self.is_terminated = true;
return Err(ExecutionError::Halted);
}
if self.is_terminated { if self.is_terminated {
return Err(ExecutionError::Terminated); return Err(ExecutionError::Terminated);
} }
if self.is_halted.load(Ordering::Relaxed) {
self.is_terminated = true;
return Err(ExecutionError::Halted);
}
// Function pulling the next action. If the action is periodic, it is // Function pulling the next action. If the action is periodic, it is
// immediately re-scheduled. // immediately re-scheduled.
fn pull_next_action(scheduler_queue: &mut MutexGuard<SchedulerQueue>) -> Action { fn pull_next_action(scheduler_queue: &mut MutexGuard<SchedulerQueue>) -> Action {