commit 6adbc1e89d0eed82822a11ead70a991e2015dc14
author Austin Schuh <austin.schuh@bluerivertech.com> Mon Apr 01 16:17:27 2024 -0700
committer Austin Schuh <austin.linux@gmail.com> Sat May 11 14:59:28 2024 -0700
tree 91ab436d575f2fa78beb935f17d35a271f60d369
parent 416505b77896b9c061913ec549180878bfd42532

Convert unreachable simulated network bridge code to CHECKs.

This simplifies the code in network bridge as we try to fix some of our
simulation problems.

Change-Id: I7e923b0df9adbd13a10ef6a38e7833f615cce3f9
Signed-off-by: James Kuszmaul <james.kuszmaul@bluerivertech.com>

aos/events/simulated_network_bridge.cc

diff --git a/aos/events/simulated_network_bridge.cc b/aos/events/simulated_network_bridge.cc
index 82ee6d1..e070270 100644
--- a/aos/events/simulated_network_bridge.cc
+++ b/aos/events/simulated_network_bridge.cc
@@ -184,23 +184,14 @@
         << " sent from " << fetcher_->channel()->source_node()->string_view()
         << " at " << fetch_node_factory_->monotonic_now();
 
-    if (timer_) {
-      if (!timer_scheduled_) {
-        server_status_->AddSentPacket(server_index_, channel_);
-        timer_->Schedule(monotonic_delivered_time);
-        timer_scheduled_ = true;
+    if (!timer_scheduled_) {
+      server_status_->AddSentPacket(server_index_, channel_);
+      timer_->Schedule(monotonic_delivered_time);
+      timer_scheduled_ = true;
 
-        QueueTransmitTimestamp(fetcher_->context().queue_index,
-                               fetcher_->context().monotonic_event_time,
-                               fetch_event_loop_->monotonic_now());
-      }
-    } else {
-      // TODO(austin): When do we hit this?  Can we add a test to make sure this
-      // is right?
-      server_status_->AddDroppedPacket(server_index_, channel_);
-      sent_ = true;
-      reliable_scheduled_ = false;
-      published_ = false;
+      QueueTransmitTimestamp(fetcher_->context().queue_index,
+                             fetcher_->context().monotonic_event_time,
+                             fetch_event_loop_->monotonic_now());
     }
   }
 
@@ -295,17 +286,10 @@
         << " sent from " << fetcher_->channel()->source_node()->string_view()
         << " at " << fetch_node_factory_->monotonic_now();
 
-    if (timer_) {
-      server_status_->AddSentPacket(server_index_, channel_);
-      timer_->Schedule(monotonic_delivered_time);
-      timer_scheduled_ = true;
-    } else {
-      server_status_->AddDroppedPacket(server_index_, channel_);
-      sent_ = true;
-      reliable_scheduled_ = false;
-      published_ = false;
-      Schedule();
-    }
+    CHECK(timer_);
+    server_status_->AddSentPacket(server_index_, channel_);
+    timer_->Schedule(monotonic_delivered_time);
+    timer_scheduled_ = true;
   }
 
  private: