commit f257f3c5a398331fd55ad05cb2f48e8320d82fc8
author Austin Schuh <austin.linux@gmail.com> Sun Oct 27 21:00:43 2019 -0700
committer Austin Schuh <austin.linux@gmail.com> Sun Oct 27 22:35:15 2019 -0700
tree 968907e4a541c78fb60c2c4f36fac76e1674e089
parent 40485ed8f5ffe81e3268f7142aedcf65062af9c0

Prefix LOG and CHECK with AOS_

This prepares us for introducing glog more widely and transitioning
things over where they make sense.

Change-Id: Ic6c208882407bc2153fe875ffc736d66f5c8ade5

aos/controls/replay_control_loop.h

diff --git a/aos/controls/replay_control_loop.h b/aos/controls/replay_control_loop.h
index 1626c0a..23593ab 100644
--- a/aos/controls/replay_control_loop.h
+++ b/aos/controls/replay_control_loop.h
@@ -74,7 +74,7 @@
     CaptureMessage() {}
 
     void operator()(const S &message) {
-      CHECK(!have_new_message_);
+      AOS_CHECK(!have_new_message_);
       saved_message_ = message;
       have_new_message_ = true;
     }
@@ -118,14 +118,14 @@
     fd = open(filename, O_RDONLY);
   }
   if (fd == -1) {
-    PLOG(FATAL, "couldn't open file '%s' for reading", filename);
+    AOS_PLOG(FATAL, "couldn't open file '%s' for reading", filename);
   }
 
   replayer_.OpenFile(fd);
   DoProcessFile();
   replayer_.CloseCurrentFile();
 
-  PCHECK(close(fd));
+  AOS_PCHECK(close(fd));
 }
 
 template <class T>
@@ -140,7 +140,7 @@
     // Send out the position message (after adjusting the time offset) so the
     // loop will run right now.
     if (!position_.have_new_message()) {
-      LOG(WARNING, "don't have a new position this cycle -> skipping\n");
+      AOS_LOG(WARNING, "don't have a new position this cycle -> skipping\n");
       status_.clear_new_message();
       position_.clear_new_message();
       output_.clear_new_message();
@@ -150,7 +150,7 @@
     {
       auto position_message = loop_group_->position.MakeMessage();
       *position_message = position_.saved_message();
-      CHECK(position_message.Send());
+      AOS_CHECK(position_message.Send());
     }
     position_.clear_new_message();
 
@@ -159,8 +159,8 @@
 
     // Point out if the status is different.
     if (!loop_group_->status->EqualsNoTime(status_.saved_message())) {
-      LOG_STRUCT(WARNING, "expected status", status_.saved_message());
-      LOG_STRUCT(WARNING, "got status", *loop_group_->status);
+      AOS_LOG_STRUCT(WARNING, "expected status", status_.saved_message());
+      AOS_LOG_STRUCT(WARNING, "got status", *loop_group_->status);
     }
     status_.clear_new_message();
 
@@ -169,17 +169,17 @@
     bool loop_new_output = loop_group_->output.FetchLatest();
     if (output_.have_new_message()) {
       if (!loop_new_output) {
-        LOG_STRUCT(WARNING, "no output, expected", output_.saved_message());
+        AOS_LOG_STRUCT(WARNING, "no output, expected", output_.saved_message());
       } else if (!loop_group_->output->EqualsNoTime(output_.saved_message())) {
-        LOG_STRUCT(WARNING, "expected output", output_.saved_message());
-        LOG_STRUCT(WARNING, "got output", *loop_group_->output);
+        AOS_LOG_STRUCT(WARNING, "expected output", output_.saved_message());
+        AOS_LOG_STRUCT(WARNING, "got output", *loop_group_->output);
       }
     } else if (loop_new_output) {
       if (zero_output_.have_new_message()) {
         if (!loop_group_->output->EqualsNoTime(zero_output_.saved_message())) {
-          LOG_STRUCT(WARNING, "expected null output",
-                     zero_output_.saved_message());
-          LOG_STRUCT(WARNING, "got output", *loop_group_->output);
+          AOS_LOG_STRUCT(WARNING, "expected null output",
+                         zero_output_.saved_message());
+          AOS_LOG_STRUCT(WARNING, "got output", *loop_group_->output);
         }
       } else {
         zero_output_(*loop_group_->output);