commit 3060894bde20778d5b0c991712091a3b88a5dacc
author Brian Silverman <brians> Wed Apr 08 19:16:46 2015 -0400
committer Brian Silverman <brian@peloton-tech.com> Mon Oct 26 11:49:29 2015 -0400
tree 2d6849a13ba3a47bc74e4e881463b0a64b07c4fb
parent 3d37a5fd055a02f13088e7d553ce01d6c22b5669

implement timeouts for events

Change-Id: I8ec89fc5bdc7b53ddc1d5c86494615c95be9bd0e

aos/common/event_test.cc

diff --git a/aos/common/event_test.cc b/aos/common/event_test.cc
index d8671eb..7331309 100644
--- a/aos/common/event_test.cc
+++ b/aos/common/event_test.cc
@@ -12,7 +12,7 @@
 
 class EventTest : public ::testing::Test {
  public:
-  Event test_event;
+  Event test_event_;
 
  protected:
   void SetUp() override {
@@ -22,13 +22,13 @@
 
 // Makes sure that basic operations with no blocking or anything work.
 TEST_F(EventTest, Basic) {
-  EXPECT_FALSE(test_event.Clear());
-  EXPECT_FALSE(test_event.Clear());
+  EXPECT_FALSE(test_event_.Clear());
+  EXPECT_FALSE(test_event_.Clear());
 
-  test_event.Set();
-  test_event.Wait();
-  EXPECT_TRUE(test_event.Clear());
-  EXPECT_FALSE(test_event.Clear());
+  test_event_.Set();
+  test_event_.Wait();
+  EXPECT_TRUE(test_event_.Clear());
+  EXPECT_FALSE(test_event_.Clear());
 }
 
 // Tests that tsan understands that events establish a happens-before
@@ -36,13 +36,13 @@
 TEST_F(EventTest, ThreadSanitizer) {
   for (int i = 0; i < 3000; ++i) {
     int variable = 0;
-    test_event.Clear();
+    test_event_.Clear();
     ::std::thread thread([this, &variable]() {
-      test_event.Wait();
+      test_event_.Wait();
       --variable;
     });
     ++variable;
-    test_event.Set();
+    test_event_.Set();
     thread.join();
     EXPECT_EQ(0, variable);
   }
@@ -56,13 +56,33 @@
   ::std::thread thread([this, &start_time, &finish_time, &started]() {
     start_time = time::Time::Now();
     started.Set();
-    test_event.Wait();
+    test_event_.Wait();
     finish_time = time::Time::Now();
   });
   static const time::Time kWaitTime = time::Time::InSeconds(0.05);
   started.Wait();
   time::SleepFor(kWaitTime);
-  test_event.Set();
+  test_event_.Set();
+  thread.join();
+  EXPECT_GE(finish_time - start_time, kWaitTime);
+}
+
+TEST_F(EventTest, WaitTimeout) {
+  EXPECT_FALSE(test_event_.WaitTimeout(time::Time::InSeconds(0.05)));
+
+  time::Time start_time, finish_time;
+  // Without this, it sometimes manages to fail under tsan.
+  Event started;
+  ::std::thread thread([this, &start_time, &finish_time, &started]() {
+    start_time = time::Time::Now();
+    started.Set();
+    EXPECT_TRUE(test_event_.WaitTimeout(time::Time::InSeconds(0.5)));
+    finish_time = time::Time::Now();
+  });
+  static const time::Time kWaitTime = time::Time::InSeconds(0.05);
+  started.Wait();
+  time::SleepFor(kWaitTime);
+  test_event_.Set();
   thread.join();
   EXPECT_GE(finish_time - start_time, kWaitTime);
 }