Move TimeModels out of sync

Author: sarsko

shuttle/src/lib.rs

@@ -187,6 +187,7 @@ pub mod lazy_static;
 pub mod rand;
 pub mod sync;
 pub mod thread;
+pub mod time;
 
 pub mod current;
 pub mod scheduler;

shuttle/src/runtime/execution.rs

@@ -6,7 +6,7 @@ use crate::runtime::task::{ChildLabelFn, Task, TaskId, TaskName, TaskSignature,
 use crate::runtime::thread;
 use crate::runtime::thread::continuation::PooledContinuation;
 use crate::scheduler::{Schedule, Scheduler};
-use crate::sync::time::{get_time_model, TimeModel};
+use crate::time::{get_time_model, TimeModel};
 use crate::sync::{ResourceSignature, ResourceType};
 use crate::thread::thread_fn;
 use crate::{backtrace_enabled, Config, MaxSteps, UNGRACEFUL_SHUTDOWN_CONFIG};

shuttle/src/runtime/runner.rs

@@ -3,7 +3,7 @@ use crate::runtime::task::{Task, TaskId};
 use crate::runtime::thread::continuation::{ContinuationPool, CONTINUATION_POOL};
 use crate::scheduler::metrics::MetricsScheduler;
 use crate::scheduler::{Schedule, Scheduler};
-use crate::sync::time::{frozen::FrozenTimeModel, TimeModel};
+use crate::time::{frozen::FrozenTimeModel, TimeModel};
 use crate::Config;
 use std::cell::RefCell;
 use std::fmt;

shuttle/src/runtime/thread/continuation.rs

@@ -1,5 +1,5 @@
 use crate::runtime::execution::ExecutionState;
-use crate::sync::time::get_time_model;
+use crate::time::get_time_model;
 use crate::{ContinuationFunctionBehavior, UNGRACEFUL_SHUTDOWN_CONFIG};
 use corosensei::Yielder;
 use corosensei::{stack::DefaultStack, Coroutine, CoroutineResult};

shuttle/src/sync/mod.rs

@@ -7,7 +7,6 @@ pub mod mpsc;
 mod mutex;
 mod once;
 mod rwlock;
-pub mod time;
 
 pub use barrier::{Barrier, BarrierWaitResult};
 pub use condvar::{Condvar, WaitTimeoutResult};

shuttle/src/thread.rs

@@ -3,13 +3,13 @@
 use crate::runtime::execution::ExecutionState;
 use crate::runtime::task::TaskId;
 use crate::runtime::thread;
-use crate::sync::time::Duration;
+use crate::time::Duration;
 use std::fmt::Debug;
 use std::marker::PhantomData;
 use std::panic::Location;
 use std::sync::atomic::{AtomicBool, AtomicUsize, Ordering};
 
-pub use crate::sync::time::sleep;
+pub use crate::time::sleep;
 pub use std::thread::{panicking, Result};
 
 /// A unique identifier for a running thread

shuttle/src/sync/time/constant_stepped.rs shuttle/src/time/constant_stepped.rsshuttle/src/sync/time/constant_stepped.rs renamed to shuttle/src/time/constant_stepped.rs

@@ -20,7 +20,7 @@ use crate::current::Labels;
 use crate::runtime::execution::ExecutionState;
 
 use crate::runtime::thread;
-use crate::sync::time::frozen::FrozenTimeModel;
+use crate::time::frozen::FrozenTimeModel;
 
 /// Constant stepped time model implementation
 pub mod constant_stepped;
@@ -50,23 +50,31 @@ pub trait TimeModel: std::fmt::Debug {
     /// Wake the next sleeping task; returns true if there exists a task that was able to be woken.
     /// Called when all tasks are blocked to resolve timing based deadlocks (all unblocked tasks are sleeping).
     fn wake_next(&mut self) -> bool;
+
     /// Reset the TimeModel state for the next Shuttle iteration
     fn new_execution(&mut self);
+
     /// Callback after each scheduling step to allow the TimeModel to update itself
     fn step(&mut self);
+
     /// Used to create the TimeModel's Instant struct in functions like Instant::now()
     fn instant(&self) -> Instant;
+
     /// Pauses the TimeModel
     fn pause(&mut self);
+
     /// Resumes the TimeModel
     fn resume(&mut self);
+
     /// Manually advances the TimeModel's clock by a fixed amount
     fn advance(&mut self, duration: Duration);
+
     /// Callback for registering a sleep/timeout on the current task. It is up to the TimeModel
     /// implementation to determine when to wake the sleeping task. If no waker is provided, then
     /// the caller is polling whether it is currently expired but is not yet performing a blocking
     /// sleep.
     fn register_sleep(&mut self, deadline: Instant, id: u64, waker: Option<Waker>) -> bool;
+
     /// Downcast to Any for type casting / checking
     fn as_any_mut(&mut self) -> &mut dyn std::any::Any;
 }

shuttle/src/sync/time/frozen.rs shuttle/src/time/frozen.rsshuttle/src/sync/time/frozen.rs renamed to shuttle/src/time/frozen.rs

@@ -1,5 +1,5 @@
 use shuttle::scheduler::PctScheduler;
-use shuttle::sync::time::Duration;
+use shuttle::time::Duration;
 use shuttle::sync::Mutex;
 use shuttle::{check_pct, check_random, thread, Config, MaxSteps, Runner};
 use std::sync::atomic::AtomicUsize;