Plumb the handle signals state to Awakable::Awake().

mojo/edk/system/waiter_unittest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // NOTE(vtl): Some of these tests are inherently flaky (e.g., if run on a
 // heavily-loaded system). Sorry. |test::EpsilonTimeout()| may be increased to
 // increase tolerance and reduce observed flakiness (though doing so reduces the
 // meaningfulness of the test).
 
 #include "mojo/edk/system/waiter.h"
@@ skipping 87 matching lines @@
   MojoResult result;
   uint64_t context;
   MojoDeadline elapsed;
 
   // Finite deadline.
 
   // Awake immediately after thread start.
   {
     WaitingThread thread(10 * test::EpsilonTimeout());
     thread.Start();
-    thread.waiter()->Awake(MOJO_RESULT_OK, 1);
+    thread.waiter()->Awake(1, Awakable::AwakeReason::SATISFIED,
+                           HandleSignalsState());
     thread.WaitUntilDone(&result, &context, &elapsed);
     EXPECT_EQ(MOJO_RESULT_OK, result);
     EXPECT_EQ(1u, context);
     EXPECT_LT(elapsed, test::EpsilonTimeout());
   }
 
   // Awake before after thread start.
   {
     WaitingThread thread(10 * test::EpsilonTimeout());
-    thread.waiter()->Awake(MOJO_RESULT_CANCELLED, 2);
+    thread.waiter()->Awake(2, Awakable::AwakeReason::CANCELLED,
+                           HandleSignalsState());
     thread.Start();
     thread.WaitUntilDone(&result, &context, &elapsed);
     EXPECT_EQ(MOJO_RESULT_CANCELLED, result);
     EXPECT_EQ(2u, context);
     EXPECT_LT(elapsed, test::EpsilonTimeout());
   }
 
   // Awake some time after thread start.
   {
     WaitingThread thread(10 * test::EpsilonTimeout());
     thread.Start();
     ThreadSleep(2 * test::EpsilonTimeout());
-    thread.waiter()->Awake(1, 3);
+    thread.waiter()->Awake(3, Awakable::AwakeReason::SATISFIED,
+                           HandleSignalsState());
     thread.WaitUntilDone(&result, &context, &elapsed);
-    EXPECT_EQ(1u, result);
+    EXPECT_EQ(MOJO_RESULT_OK, result);
     EXPECT_EQ(3u, context);
     EXPECT_GT(elapsed, (2 - 1) * test::EpsilonTimeout());
     EXPECT_LT(elapsed, (2 + 1) * test::EpsilonTimeout());
   }
 
   // Awake some longer time after thread start.
   {
     WaitingThread thread(10 * test::EpsilonTimeout());
     thread.Start();
     ThreadSleep(5 * test::EpsilonTimeout());
-    thread.waiter()->Awake(2, 4);
+    thread.waiter()->Awake(4, Awakable::AwakeReason::UNSATISFIABLE,
+                           HandleSignalsState());
     thread.WaitUntilDone(&result, &context, &elapsed);
-    EXPECT_EQ(2u, result);
+    EXPECT_EQ(MOJO_RESULT_FAILED_PRECONDITION, result);
     EXPECT_EQ(4u, context);
     EXPECT_GT(elapsed, (5 - 1) * test::EpsilonTimeout());
     EXPECT_LT(elapsed, (5 + 1) * test::EpsilonTimeout());
   }
 
   // Don't awake -- time out (on another thread).
   {
     WaitingThread thread(2 * test::EpsilonTimeout());
     thread.Start();
     thread.WaitUntilDone(&result, &context, &elapsed);
     EXPECT_EQ(MOJO_RESULT_DEADLINE_EXCEEDED, result);
     EXPECT_EQ(static_cast<uint64_t>(-1), context);
     EXPECT_GT(elapsed, (2 - 1) * test::EpsilonTimeout());
     EXPECT_LT(elapsed, (2 + 1) * test::EpsilonTimeout());
   }
 
   // No (indefinite) deadline.
 
   // Awake immediately after thread start.
   {
     WaitingThread thread(MOJO_DEADLINE_INDEFINITE);
     thread.Start();
-    thread.waiter()->Awake(MOJO_RESULT_OK, 5);
+    thread.waiter()->Awake(5, Awakable::AwakeReason::SATISFIED,
+                           HandleSignalsState());
     thread.WaitUntilDone(&result, &context, &elapsed);
     EXPECT_EQ(MOJO_RESULT_OK, result);
     EXPECT_EQ(5u, context);
     EXPECT_LT(elapsed, test::EpsilonTimeout());
   }
 
   // Awake before after thread start.
   {
     WaitingThread thread(MOJO_DEADLINE_INDEFINITE);
-    thread.waiter()->Awake(MOJO_RESULT_CANCELLED, 6);
+    thread.waiter()->Awake(6, Awakable::AwakeReason::CANCELLED,
+                           HandleSignalsState());
     thread.Start();
     thread.WaitUntilDone(&result, &context, &elapsed);
     EXPECT_EQ(MOJO_RESULT_CANCELLED, result);
     EXPECT_EQ(6u, context);
     EXPECT_LT(elapsed, test::EpsilonTimeout());
   }
 
   // Awake some time after thread start.
   {
     WaitingThread thread(MOJO_DEADLINE_INDEFINITE);
     thread.Start();
     ThreadSleep(2 * test::EpsilonTimeout());
-    thread.waiter()->Awake(1, 7);
+    thread.waiter()->Awake(7, Awakable::AwakeReason::UNSATISFIABLE,
+                           HandleSignalsState());
     thread.WaitUntilDone(&result, &context, &elapsed);
-    EXPECT_EQ(1u, result);
+    EXPECT_EQ(MOJO_RESULT_FAILED_PRECONDITION, result);
     EXPECT_EQ(7u, context);
     EXPECT_GT(elapsed, (2 - 1) * test::EpsilonTimeout());
     EXPECT_LT(elapsed, (2 + 1) * test::EpsilonTimeout());
   }
 
   // Awake some longer time after thread start.
   {
     WaitingThread thread(MOJO_DEADLINE_INDEFINITE);
     thread.Start();
     ThreadSleep(5 * test::EpsilonTimeout());
-    thread.waiter()->Awake(2, 8);
+    thread.waiter()->Awake(8, Awakable::AwakeReason::CANCELLED,
+                           HandleSignalsState());
     thread.WaitUntilDone(&result, &context, &elapsed);
-    EXPECT_EQ(2u, result);
+    EXPECT_EQ(MOJO_RESULT_CANCELLED, result);
     EXPECT_EQ(8u, context);
     EXPECT_GT(elapsed, (5 - 1) * test::EpsilonTimeout());
     EXPECT_LT(elapsed, (5 + 1) * test::EpsilonTimeout());
   }
 }
 
 TEST(WaiterTest, TimeOut) {
   Stopwatch stopwatch;
   MojoDeadline elapsed;
 
@@ skipping 28 matching lines @@
 
 // The first |Awake()| should always win.
 TEST(WaiterTest, MultipleAwakes) {
   MojoResult result;
   uint64_t context;
   MojoDeadline elapsed;
 
   {
     WaitingThread thread(MOJO_DEADLINE_INDEFINITE);
     thread.Start();
-    thread.waiter()->Awake(MOJO_RESULT_OK, 1);
-    thread.waiter()->Awake(1, 2);
+    thread.waiter()->Awake(1, Awakable::AwakeReason::SATISFIED,
+                           HandleSignalsState());
+    thread.waiter()->Awake(2, Awakable::AwakeReason::UNSATISFIABLE,
+                           HandleSignalsState());
     thread.WaitUntilDone(&result, &context, &elapsed);
     EXPECT_EQ(MOJO_RESULT_OK, result);
     EXPECT_EQ(1u, context);
     EXPECT_LT(elapsed, test::EpsilonTimeout());
   }
 
   {
     WaitingThread thread(MOJO_DEADLINE_INDEFINITE);
-    thread.waiter()->Awake(1, 3);
+    thread.waiter()->Awake(3, Awakable::AwakeReason::UNSATISFIABLE,
+                           HandleSignalsState());
     thread.Start();
-    thread.waiter()->Awake(MOJO_RESULT_OK, 4);
+    thread.waiter()->Awake(4, Awakable::AwakeReason::SATISFIED,
+                           HandleSignalsState());
     thread.WaitUntilDone(&result, &context, &elapsed);
-    EXPECT_EQ(1u, result);
+    EXPECT_EQ(MOJO_RESULT_FAILED_PRECONDITION, result);
     EXPECT_EQ(3u, context);
     EXPECT_LT(elapsed, test::EpsilonTimeout());
   }
 
   {
     WaitingThread thread(MOJO_DEADLINE_INDEFINITE);
     thread.Start();
-    thread.waiter()->Awake(10, 5);
+    thread.waiter()->Awake(5, Awakable::AwakeReason::CANCELLED,
+                           HandleSignalsState());
     ThreadSleep(2 * test::EpsilonTimeout());
-    thread.waiter()->Awake(20, 6);
+    thread.waiter()->Awake(6, Awakable::AwakeReason::UNSATISFIABLE,
+                           HandleSignalsState());
     thread.WaitUntilDone(&result, &context, &elapsed);
-    EXPECT_EQ(10u, result);
+    EXPECT_EQ(MOJO_RESULT_CANCELLED, result);
     EXPECT_EQ(5u, context);
     EXPECT_LT(elapsed, test::EpsilonTimeout());
   }
 
   {
     WaitingThread thread(10 * test::EpsilonTimeout());
     thread.Start();
     ThreadSleep(1 * test::EpsilonTimeout());
-    thread.waiter()->Awake(MOJO_RESULT_FAILED_PRECONDITION, 7);
+    thread.waiter()->Awake(7, Awakable::AwakeReason::UNSATISFIABLE,
+                           HandleSignalsState());
     ThreadSleep(2 * test::EpsilonTimeout());
-    thread.waiter()->Awake(MOJO_RESULT_OK, 8);
+    thread.waiter()->Awake(8, Awakable::AwakeReason::SATISFIED,
+                           HandleSignalsState());
     thread.WaitUntilDone(&result, &context, &elapsed);
     EXPECT_EQ(MOJO_RESULT_FAILED_PRECONDITION, result);
     EXPECT_EQ(7u, context);
     EXPECT_GT(elapsed, (1 - 1) * test::EpsilonTimeout());
     EXPECT_LT(elapsed, (1 + 1) * test::EpsilonTimeout());
   }
 }
 
 }  // namespace
 }  // namespace system
 }  // namespace mojo