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

Revert "Merge pull request #12 from asynchronics/feature/event-sinks"

Browse Source 
This reverts commit 7e881afb63, reversing
changes made to 9d78e4f72a.
This commit is contained in:
Serge Barral
2024-03-06 16:16:55 +01:00
parent 43e41012d2
commit 1be2f48a00
25 changed files with 870 additions and 573 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
asynchronix/tests/simulation_scheduling.rs
View File

@@ -3,7 +3,7 @@
use std::time::Duration;
use asynchronix::model::{Model, Output};
use asynchronix::simulation::{Address, EventQueue, Mailbox, SimInit, Simulation};
use asynchronix::simulation::{Address, EventStream, Mailbox, SimInit, Simulation};
use asynchronix::time::MonotonicTime;
// Input-to-output pass-through model.
@@ -26,13 +26,12 @@ impl<T: Clone + Send + 'static> Model for PassThroughModel<T> {}
/// output) running as fast as possible.
fn passthrough_bench<T: Clone + Send + 'static>(
t0: MonotonicTime,
) -> (Simulation, Address<PassThroughModel<T>>, EventQueue<T>) {
) -> (Simulation, Address<PassThroughModel<T>>, EventStream<T>) {
// Bench assembly.
let mut model = PassThroughModel::new();
let mbox = Mailbox::new();
let out_stream = EventQueue::new();
model.output.connect_sink(&out_stream);
let out_stream = model.output.connect_stream().0;
let addr = mbox.address();
let simu = SimInit::new().add_model(model, mbox).init(t0);
@@ -244,14 +243,13 @@ fn timestamp_bench(
) -> (
Simulation,
Address<TimestampModel>,
EventQueue<(Instant, SystemTime)>,
EventStream<(Instant, SystemTime)>,
) {
// Bench assembly.
let mut model = TimestampModel::default();
let mbox = Mailbox::new();
let stamp_stream = EventQueue::new();
model.stamp.connect_sink(&stamp_stream);
let stamp_stream = model.stamp.connect_stream().0;
let addr = mbox.address();
let simu = SimInit::new()