commit 60e7794ead037e5fe38cfe5f789f3e01832a84f1
author Austin Schuh <austin.linux@gmail.com> Mon May 16 17:48:24 2022 -0700
committer Austin Schuh <austin.linux@gmail.com> Mon May 16 17:55:25 2022 -0700
tree 38c9c1a14b8af417ee2afb092e83aaf46d43037f
parent 3903feee369116552a8c7006f35d8b2d490a16c0

Clang-format aos

It has drifted...  Clean it up a bit.

Change-Id: I2fe31a2187b4f690634ae6942786575db20192af
Signed-off-by: Austin Schuh <austin.linux@gmail.com>

aos/events/logging/logfile_utils.cc

diff --git a/aos/events/logging/logfile_utils.cc b/aos/events/logging/logfile_utils.cc
index ecdf5d6..01f3002 100644
--- a/aos/events/logging/logfile_utils.cc
+++ b/aos/events/logging/logfile_utils.cc
@@ -558,8 +558,8 @@
     }
 
     if (span_reader_.IsIncomplete()) {
-      LOG(ERROR) << "Unable to access some messages in " << filename()
-                 << " : " << span_reader_.TotalRead() << " bytes read, "
+      LOG(ERROR) << "Unable to access some messages in " << filename() << " : "
+                 << span_reader_.TotalRead() << " bytes read, "
                  << span_reader_.TotalConsumed() << " bytes usable."
                  << std::endl;
     }
@@ -570,15 +570,14 @@
 
   if (crash_on_corrupt_message_flag_) {
     CHECK(msg.Verify()) << "Corrupted message at offset "
-                        << total_verified_before_
-                        << " found within " << filename()
+                        << total_verified_before_ << " found within "
+                        << filename()
                         << "; set --nocrash_on_corrupt_message to see summary;"
                         << " also set --ignore_corrupt_messages to process"
                         << " anyway";
 
   } else if (!msg.Verify()) {
-    LOG(ERROR) << "Corrupted message at offset "
-               << total_verified_before_
+    LOG(ERROR) << "Corrupted message at offset " << total_verified_before_
                << " from " << filename() << std::endl;
 
     total_corrupted_ += msg_data.size();
@@ -922,14 +921,13 @@
       size_t monotonic_remote_boot = 0xffffff;
 
       if (m->monotonic_remote_time.has_value()) {
-        const Node *node = parts().config->nodes()->Get(
-            source_node_index_[m->channel_index]);
+        const Node *node =
+            parts().config->nodes()->Get(source_node_index_[m->channel_index]);
 
         std::optional<size_t> boot = parts_message_reader_.boot_count(
             source_node_index_[m->channel_index]);
         CHECK(boot) << ": Failed to find boot for node " << MaybeNodeName(node)
-                    << ", with index "
-                    << source_node_index_[m->channel_index];
+                    << ", with index " << source_node_index_[m->channel_index];
         monotonic_remote_boot = *boot;
       }
 
@@ -1242,16 +1240,16 @@
 }
 
 void TimestampMapper::QueueMessage(Message *m) {
-  matched_messages_.emplace_back(TimestampedMessage{
-      .channel_index = m->channel_index,
-      .queue_index = m->queue_index,
-      .monotonic_event_time = m->timestamp,
-      .realtime_event_time = m->data->realtime_sent_time,
-      .remote_queue_index = BootQueueIndex::Invalid(),
-      .monotonic_remote_time = BootTimestamp::min_time(),
-      .realtime_remote_time = realtime_clock::min_time,
-      .monotonic_timestamp_time = BootTimestamp::min_time(),
-      .data = std::move(m->data)});
+  matched_messages_.emplace_back(
+      TimestampedMessage{.channel_index = m->channel_index,
+                         .queue_index = m->queue_index,
+                         .monotonic_event_time = m->timestamp,
+                         .realtime_event_time = m->data->realtime_sent_time,
+                         .remote_queue_index = BootQueueIndex::Invalid(),
+                         .monotonic_remote_time = BootTimestamp::min_time(),
+                         .realtime_remote_time = realtime_clock::min_time,
+                         .monotonic_timestamp_time = BootTimestamp::min_time(),
+                         .data = std::move(m->data)});
 }
 
 TimestampedMessage *TimestampMapper::Front() {
@@ -1448,13 +1446,12 @@
 
   if (remote_queue_index < data_queue->front().queue_index ||
       remote_queue_index > data_queue->back().queue_index) {
-    return Message{
-        .channel_index = message.channel_index,
-        .queue_index = remote_queue_index,
-        .timestamp = monotonic_remote_time,
-        .monotonic_remote_boot = 0xffffff,
-        .monotonic_timestamp_boot = 0xffffff,
-        .data = nullptr};
+    return Message{.channel_index = message.channel_index,
+                   .queue_index = remote_queue_index,
+                   .timestamp = monotonic_remote_time,
+                   .monotonic_remote_boot = 0xffffff,
+                   .monotonic_timestamp_boot = 0xffffff,
+                   .data = nullptr};
   }
 
   // The algorithm below is constant time with some assumptions.  We need there