Allow simulated nodes to startup after global startup
This lets us not boot nodes until their monotonic clock has reached
zero.
This also changes the semantics of OnStartup slightly--even if all the
nodes startup at the start of the simulation, they will each complete
their own startup sequence before going to the next node. This doesn't
appear to have had any negative consequences (and is similar
to if the nodes had tiny monotonic clock offsets that forced several of
the nodes to start late), but is a change.
Change-Id: I25d343b9509a3cdae6db9747f60a212f1cb21187
Signed-off-by: James Kuszmaul <james.kuszmaul@bluerivertech.com>
diff --git a/aos/events/simulated_network_bridge.cc b/aos/events/simulated_network_bridge.cc
index 108176e..31f3f0e 100644
--- a/aos/events/simulated_network_bridge.cc
+++ b/aos/events/simulated_network_bridge.cc
@@ -138,7 +138,6 @@
if (fetcher_->context().data == nullptr || sent_) {
return;
}
- CHECK(!timer_scheduled_);
// Send at startup. It is the best we can do.
const monotonic_clock::time_point monotonic_delivered_time =
@@ -739,6 +738,25 @@
destination_delayer->ScheduleReliable();
}
}
+ // Note: This exists to work around the fact that some users like to be able
+ // to send reliable messages while execution is stopped, creating a
+ // situation where the following sequencing can occur:
+ // 1) <While stopped> Send a reliable message on Node A (to be forwarded to
+ // Node B).
+ // 2) Node B starts up.
+ // 3) Anywhere from 0 to N seconds later, Node A starts up.
+ //
+ // In this case, we need the reliable message to make it to Node B, but it
+ // also shouldn't make it to Node B until Node A has started up.
+ //
+ // Ideally, if the user were to wait for the Node B OnRun callbacks to send
+ // the message, then that would trigger the watchers in the delayers.
+ // However, we so far have continued to support Sending while stopped....
+ for (RawMessageDelayer *source_delayer : source_delayers_) {
+ if (source_delayer->time_to_live() == 0) {
+ source_delayer->ScheduleReliable();
+ }
+ }
});
}