commit b22ae42cc754be5924b6e42f7d5296de972e2fdd
author Austin Schuh <austin.linux@gmail.com> Sun Jan 31 17:57:06 2021 -0800
committer Austin Schuh <austin.linux@gmail.com> Sun Jan 31 17:58:29 2021 -0800
tree e7c19c1666ed8b2f7a75b834dbc19fe33d98912d
parent d99a3c4300b99e5bc560f0946a6612419a51381d

Sort the RemoteMessageSender queue

Timestamps aren't guarenteed to come in order.  Sort them so we wake up
and send the replies in the correct order

Change-Id: I3ecdda42413f8c994f51bf39b7dbbe334617d178

aos/events/logging/logger.cc

diff --git a/aos/events/logging/logger.cc b/aos/events/logging/logger.cc
index eb7221d..52e148b 100644
--- a/aos/events/logging/logger.cc
+++ b/aos/events/logging/logger.cc
@@ -2034,8 +2034,16 @@
         << ": Unsupported mix of timestamps and no timestamps.";
     sender_.Send(std::move(remote_message));
   } else {
-    remote_timestamps_.emplace_back(std::move(remote_message),
-                                    monotonic_timestamp_time);
+    remote_timestamps_.emplace(
+        std::upper_bound(
+            remote_timestamps_.begin(), remote_timestamps_.end(),
+            monotonic_timestamp_time,
+            [](const aos::monotonic_clock::time_point monotonic_timestamp_time,
+               const Timestamp &timestamp) {
+              return monotonic_timestamp_time <
+                     timestamp.monotonic_timestamp_time;
+            }),
+        std::move(remote_message), monotonic_timestamp_time);
     ScheduleTimestamp();
   }
 }