commit 67ddb03a58cad002ec78ea8677e5c42e4e1dbb3b
author Tyler Chatow <tchatow@gmail.com> Sun Jan 12 14:30:04 2020 -0800
committer Tyler Chatow <tchatow@gmail.com> Sat Feb 01 18:29:03 2020 -0800
tree 5df94f613fba4eec2be496cddf690e653c491bc8
parent e6f9314656de467ffe2aaf2a284267040a0a07f8

AOS_LOG to messages

Change-Id: I0cb78a957a180f4472fc3e78a75eade63e4e43b8

aos/events/logging/log_cat.cc

diff --git a/aos/events/logging/log_cat.cc b/aos/events/logging/log_cat.cc
index 80ec8e7..f2427b8 100644
--- a/aos/events/logging/log_cat.cc
+++ b/aos/events/logging/log_cat.cc
@@ -33,6 +33,7 @@
   std::unique_ptr<aos::EventLoop> printer_event_loop =
       reader.event_loop_factory()->MakeEventLoop("printer", reader.node());
   printer_event_loop->SkipTimingReport();
+  printer_event_loop->SkipAosLog();
 
   bool found_channel = false;
   const flatbuffers::Vector<flatbuffers::Offset<aos::Channel>> *channels =

aos/events/logging/log_stats.cc

diff --git a/aos/events/logging/log_stats.cc b/aos/events/logging/log_stats.cc
index c766fe6..65da871 100644
--- a/aos/events/logging/log_stats.cc
+++ b/aos/events/logging/log_stats.cc
@@ -67,6 +67,7 @@
   std::unique_ptr<aos::EventLoop> stats_event_loop =
       log_reader_factory.MakeEventLoop("logstats", reader.node());
   stats_event_loop->SkipTimingReport();
+  stats_event_loop->SkipAosLog();
 
   // Read channel info and store in vector
   bool found_channel = false;

aos/events/logging/logger.cc

diff --git a/aos/events/logging/logger.cc b/aos/events/logging/logger.cc
index 2de17d7..c501d7b 100644
--- a/aos/events/logging/logger.cc
+++ b/aos/events/logging/logger.cc
@@ -299,8 +299,12 @@
 void LogReader::Register(EventLoop *event_loop) {
   event_loop_ = event_loop;
 
+  // We don't run timing reports when trying to print out logged data, because
+  // otherwise we would end up printing out the timing reports themselves...
+  // This is only really relevant when we are replaying into a simulation.
   // Otherwise we replay the timing report and try to resend it...
   event_loop_->SkipTimingReport();
+  event_loop_->SkipAosLog();
 
   for (size_t i = 0; i < channels_.size(); ++i) {
     const Channel *const original_channel =

aos/events/logging/multinode_pingpong.json

diff --git a/aos/events/logging/multinode_pingpong.json b/aos/events/logging/multinode_pingpong.json
index f85a4e1..be8a402 100644
--- a/aos/events/logging/multinode_pingpong.json
+++ b/aos/events/logging/multinode_pingpong.json
@@ -1,5 +1,21 @@
 {
   "channels": [
+    {
+      "name": "/aos/pi1",
+      "type": "aos.logging.LogMessageFbs",
+      "source_node": "pi1",
+      "frequency": 200,
+      "num_senders": 20,
+      "max_size": 2048
+    },
+    {
+      "name": "/aos/pi2",
+      "type": "aos.logging.LogMessageFbs",
+      "source_node": "pi2",
+      "frequency": 200,
+      "num_senders": 20,
+      "max_size": 2048
+    },
     /* Logged on pi1 locally */
     {
       "name": "/aos/pi1",
@@ -57,6 +73,26 @@
     }
   ],
   "maps": [
+   {
+      "match": {
+        "name": "/aos",
+        "type": "aos.logging.LogMessageFbs",
+        "source_node": "pi1"
+      },
+      "rename": {
+        "name": "/aos/pi1"
+      }
+    },
+    {
+      "match": {
+        "name": "/aos",
+        "type": "aos.logging.LogMessageFbs",
+        "source_node": "pi2"
+      },
+      "rename": {
+        "name": "/aos/pi2"
+      }
+    },
     {
       "match": {
         "name": "/aos",