commit 5d89cf5b85ebb82795e225d04b88df3eb7d856ea
author Austin Schuh <austin.linux@gmail.com> Sat Dec 28 16:27:42 2019 -0800
committer Austin Schuh <austin.linux@gmail.com> Wed Jan 01 14:07:16 2020 -0800
tree a7b142a915270211bcfabc59064818a13cb25874
parent 03e80a60889653d3e2079f0ef599c665e0990ef1

Simplify ping and pong

The simple demo apps grew to the point where they were no longer simple
and easy to understand since I was using them to test out timing reports
and accidentally committed the changes.  Restore the simplicity.

Change-Id: I453fa0351247c4549098660cd21191659269f515

aos/events/ping_lib.cc

diff --git a/aos/events/ping_lib.cc b/aos/events/ping_lib.cc
index 4bbf580..9bc2446 100644
--- a/aos/events/ping_lib.cc
+++ b/aos/events/ping_lib.cc
@@ -1,13 +1,12 @@
 #include "aos/events/ping_lib.h"
 
-#include "aos/events/pong_generated.h"
 #include "aos/events/ping_generated.h"
+#include "aos/events/pong_generated.h"
 #include "aos/json_to_flatbuffer.h"
 #include "gflags/gflags.h"
 #include "glog/logging.h"
 
 DEFINE_int32(sleep_ms, 10, "Time to sleep between pings");
-DEFINE_bool(phased_loop, false, "If true, use a phased loop");
 
 namespace aos {
 
@@ -15,25 +14,16 @@
 
 Ping::Ping(EventLoop *event_loop)
     : event_loop_(event_loop),
-      sender_(event_loop_->MakeSender<examples::Ping>("/test")),
-      pong_fetcher_(event_loop_->MakeFetcher<examples::Pong>("/test")) {
-  if (FLAGS_phased_loop) {
-    phased_loop_handle_ = event_loop_->AddPhasedLoop(
-        [this](int) { SendPing(); }, chrono::milliseconds(FLAGS_sleep_ms));
-    phased_loop_handle_->set_name("ping");
-  } else {
-    timer_handle_ = event_loop_->AddTimer([this]() { SendPing(); });
-    timer_handle_->set_name("ping");
-  }
+      sender_(event_loop_->MakeSender<examples::Ping>("/test")) {
+  timer_handle_ = event_loop_->AddTimer([this]() { SendPing(); });
+  timer_handle_->set_name("ping");
 
   event_loop_->MakeWatcher(
       "/test", [this](const examples::Pong &pong) { HandlePong(pong); });
 
   event_loop_->OnRun([this]() {
-    if (!FLAGS_phased_loop) {
-      timer_handle_->Setup(event_loop_->monotonic_now(),
-                           chrono::milliseconds(FLAGS_sleep_ms));
-    }
+    timer_handle_->Setup(event_loop_->monotonic_now(),
+                         chrono::milliseconds(FLAGS_sleep_ms));
   });
 
   event_loop_->SetRuntimeRealtimePriority(5);
@@ -41,17 +31,16 @@
 
 void Ping::SendPing() {
   ++count_;
-  aos::Sender<examples::Ping>::Builder msg = sender_.MakeBuilder();
-  examples::Ping::Builder builder = msg.MakeBuilder<examples::Ping>();
-  builder.add_value(count_);
-  builder.add_send_time(
+  aos::Sender<examples::Ping>::Builder builder = sender_.MakeBuilder();
+  examples::Ping::Builder ping_builder = builder.MakeBuilder<examples::Ping>();
+  ping_builder.add_value(count_);
+  ping_builder.add_send_time(
       event_loop_->monotonic_now().time_since_epoch().count());
-  CHECK(msg.Send(builder.Finish()));
+  CHECK(builder.Send(ping_builder.Finish()));
   VLOG(2) << "Sending ping";
 }
 
 void Ping::HandlePong(const examples::Pong &pong) {
-  pong_fetcher_.Fetch();
   const aos::monotonic_clock::time_point monotonic_send_time(
       chrono::nanoseconds(pong.initial_send_time()));
   const aos::monotonic_clock::time_point monotonic_now =
@@ -60,11 +49,19 @@
   const chrono::nanoseconds round_trip_time =
       monotonic_now - monotonic_send_time;
 
+  if (last_pong_value_ + 1 != pong.value()) {
+    LOG(WARNING) << "Pong message lost";
+  }
+
   if (pong.value() == count_) {
     VLOG(1) << "Elapsed time " << round_trip_time.count() << " ns "
             << FlatbufferToJson(&pong);
   } else {
-    VLOG(1) << "Missmatched pong message";
+    LOG(WARNING) << "Missmatched pong message, got " << FlatbufferToJson(&pong)
+                 << " expected " << count_;
   }
+
+  last_pong_value_ = pong.value();
 }
+
 }  // namespace aos