commit 6b6dfa5a91463a8a829d6e939f58b9fe8adbe80f
author Austin Schuh <austin.linux@gmail.com> Wed Jun 12 20:16:20 2019 -0700
committer Austin Schuh <austin.linux@gmail.com> Sat Aug 10 19:33:36 2019 -0700
tree 7b97da174f2c8d4cb5e8fb8c7bdf0ef3cd0e80d6
parent 27569776893b0558a5b969c8cbc522281313ec96

Run all timers in the main thread with epoll

This ditches 1+ threads in all use cases.

Change-Id: I8772a539c20cd10d80a57f3f53c48a3d8124461a

aos/events/event-loop_param_test.cc

diff --git a/aos/events/event-loop_param_test.cc b/aos/events/event-loop_param_test.cc
index 5276aec..c74538c 100644
--- a/aos/events/event-loop_param_test.cc
+++ b/aos/events/event-loop_param_test.cc
@@ -26,10 +26,38 @@
                    ::std::chrono::milliseconds(duration));
 }
 
-// Tests that watcher and fetcher can fetch from a sender.
+// Tests that watcher can receive messages from a sender.
 // Also tests that OnRun() works.
 TEST_P(AbstractEventLoopTest, Basic) {
   auto loop1 = Make();
+  auto loop2 = MakePrimary();
+
+  auto sender = loop1->MakeSender<TestMessage>("/test");
+
+  bool happened = false;
+
+  loop2->OnRun([&]() {
+    happened = true;
+
+    auto msg = sender.MakeMessage();
+    msg->msg_value = 200;
+    msg.Send();
+  });
+
+  loop2->MakeWatcher("/test", [&](const TestMessage &message) {
+    EXPECT_EQ(message.msg_value, 200);
+    loop2->Exit();
+  });
+
+  EXPECT_FALSE(happened);
+  Run();
+  EXPECT_TRUE(happened);
+}
+
+// Tests that a fetcher can fetch from a sender.
+// Also tests that OnRun() works.
+TEST_P(AbstractEventLoopTest, FetchWithoutRun) {
+  auto loop1 = Make();
   auto loop2 = Make();
   auto loop3 = MakePrimary();
 
@@ -39,15 +67,6 @@
 
   EXPECT_FALSE(fetcher.Fetch());
 
-  bool happened = false;
-
-  loop3->OnRun([&]() { happened = true; });
-
-  loop3->MakeWatcher("/test", [&](const TestMessage &message) {
-    EXPECT_EQ(message.msg_value, 200);
-    loop3->Exit();
-  });
-
   auto msg = sender.MakeMessage();
   msg->msg_value = 200;
   msg.Send();
@@ -55,10 +74,6 @@
   EXPECT_TRUE(fetcher.Fetch());
   ASSERT_FALSE(fetcher.get() == nullptr);
   EXPECT_EQ(fetcher->msg_value, 200);
-
-  EXPECT_FALSE(happened);
-  Run();
-  EXPECT_TRUE(happened);
 }
 
 // Tests that watcher will receive all messages sent if they are sent after
@@ -78,16 +93,25 @@
     }
   });
 
+  // Before Run, should be ignored.
   {
     auto msg = sender.MakeMessage();
-    msg->msg_value = 200;
+    msg->msg_value = 199;
     msg.Send();
   }
-  {
-    auto msg = sender.MakeMessage();
-    msg->msg_value = 201;
-    msg.Send();
-  }
+
+  loop2->OnRun([&]() {
+    {
+      auto msg = sender.MakeMessage();
+      msg->msg_value = 200;
+      msg.Send();
+    }
+    {
+      auto msg = sender.MakeMessage();
+      msg->msg_value = 201;
+      msg.Send();
+    }
+  });
 
   Run();
 
@@ -361,7 +385,7 @@
 }
 
 // Verify that registering a watcher twice for "/test" fails.
-TEST_P(AbstractEventLoopTest, TwoWatcher) {
+TEST_P(AbstractEventLoopDeathTest, TwoWatcher) {
   auto loop = Make();
   loop->MakeWatcher("/test", [&](const TestMessage &) {});
   EXPECT_DEATH(loop->MakeWatcher("/test", [&](const TestMessage &) {}),
@@ -369,7 +393,7 @@
 }
 
 // Verify that SetRuntimeRealtimePriority fails while running.
-TEST_P(AbstractEventLoopTest, SetRuntimeRealtimePriority) {
+TEST_P(AbstractEventLoopDeathTest, SetRuntimeRealtimePriority) {
   auto loop = MakePrimary();
   // Confirm that runtime priority calls work when not realtime.
   loop->SetRuntimeRealtimePriority(5);
@@ -380,13 +404,33 @@
 }
 
 // Verify that registering a watcher and a sender for "/test" fails.
-TEST_P(AbstractEventLoopTest, WatcherAndSender) {
+TEST_P(AbstractEventLoopDeathTest, WatcherAndSender) {
   auto loop = Make();
   auto sender = loop->MakeSender<TestMessage>("/test");
   EXPECT_DEATH(loop->MakeWatcher("/test", [&](const TestMessage &) {}),
                "/test");
 }
 
+// Verify that we can't create a sender inside OnRun.
+TEST_P(AbstractEventLoopDeathTest, SenderInOnRun) {
+  auto loop1 = MakePrimary();
+
+  loop1->OnRun(
+      [&]() { auto sender = loop1->MakeSender<TestMessage>("/test2"); });
+
+  EXPECT_DEATH(Run(), "running");
+}
+
+// Verify that we can't create a watcher inside OnRun.
+TEST_P(AbstractEventLoopDeathTest, WatcherInOnRun) {
+  auto loop1 = MakePrimary();
+
+  loop1->OnRun(
+      [&]() { loop1->MakeWatcher("/test", [&](const TestMessage &) {}); });
+
+  EXPECT_DEATH(Run(), "running");
+}
+
 // Verify that Quit() works when there are multiple watchers.
 TEST_P(AbstractEventLoopTest, MultipleWatcherQuit) {
   auto loop1 = Make();
@@ -399,11 +443,12 @@
   });
 
   auto sender = loop1->MakeSender<TestMessage>("/test2");
-  {
+
+  loop2->OnRun([&]() {
     auto msg = sender.MakeMessage();
     msg->msg_value = 200;
     msg.Send();
-  }
+  });
 
   Run();
 }