Rationalize AddAwakable...() and RemoveAwakable...() methods.

mojo/edk/system/dispatcher_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.
 
 #include "mojo/edk/system/dispatcher.h"
 
 #include <memory>
 #include <thread>
 #include <vector>
 
@@ skipping 57 matching lines @@
   EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT,
             d->GetBufferInformation(NullUserPointer(), 0u));
   std::unique_ptr<PlatformSharedBufferMapping> mapping;
   EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT,
             d->MapBuffer(0u, 1u, MOJO_MAP_BUFFER_FLAG_NONE, &mapping));
   EXPECT_FALSE(mapping);
   Waiter w;
   w.Init();
   HandleSignalsState hss;
   EXPECT_EQ(MOJO_RESULT_FAILED_PRECONDITION,
-            d->AddAwakable(&w, ~MOJO_HANDLE_SIGNAL_NONE, 0, &hss));
+            d->AddAwakable(&w, 0, false, ~MOJO_HANDLE_SIGNAL_NONE, &hss));
   EXPECT_EQ(0u, hss.satisfied_signals);
   EXPECT_EQ(0u, hss.satisfiable_signals);
   // Okay to remove even if it wasn't added (or was already removed).
   hss = HandleSignalsState();
-  d->RemoveAwakable(&w, &hss);
+  d->RemoveAwakable(false, &w, 0, &hss);
   EXPECT_EQ(0u, hss.satisfied_signals);
   EXPECT_EQ(0u, hss.satisfiable_signals);
   hss = HandleSignalsState();
-  d->RemoveAwakable(&w, &hss);
+  d->RemoveAwakable(false, &w, 0, &hss);
   EXPECT_EQ(0u, hss.satisfied_signals);
   EXPECT_EQ(0u, hss.satisfiable_signals);
 
   EXPECT_EQ(MOJO_RESULT_OK, d->Close());
 
   EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT,
             d->WriteMessage(NullUserPointer(), 0, nullptr,
                             MOJO_WRITE_MESSAGE_FLAG_NONE));
   EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT,
             d->ReadMessage(NullUserPointer(), NullUserPointer(), nullptr,
@@ skipping 25 matching lines @@
             d->DuplicateBufferHandle(NullUserPointer(), &new_dispatcher));
   EXPECT_FALSE(new_dispatcher);
   EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT,
             d->GetBufferInformation(NullUserPointer(), 0u));
   mapping.reset();
   EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT,
             d->MapBuffer(0u, 1u, MOJO_MAP_BUFFER_FLAG_NONE, &mapping));
   EXPECT_FALSE(mapping);
   hss = HandleSignalsState();
   EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT,
-            d->AddAwakable(&w, ~MOJO_HANDLE_SIGNAL_NONE, 0, &hss));
+            d->AddAwakable(&w, 0, false, ~MOJO_HANDLE_SIGNAL_NONE, &hss));
   EXPECT_EQ(0u, hss.satisfied_signals);
   EXPECT_EQ(0u, hss.satisfiable_signals);
   hss = HandleSignalsState();
-  d->RemoveAwakable(&w, &hss);
+  d->RemoveAwakable(false, &w, 0, &hss);
   EXPECT_EQ(0u, hss.satisfied_signals);
   EXPECT_EQ(0u, hss.satisfiable_signals);
 }
 
 enum class DispatcherOp {
   CLOSE = 0,
   DUPLICATE_DISPATCHER,
   WRITE_MESSAGE,
   READ_MESSAGE,
   SET_DATA_PIPE_PRODUCER_OPTIONS,
@@ skipping 111 matching lines @@
     case DispatcherOp::MAP_BUFFER: {
       std::unique_ptr<PlatformSharedBufferMapping> mapping;
       EXPECT_EQ(
           MOJO_RESULT_INVALID_ARGUMENT,
           dispatcher->MapBuffer(0u, 1u, MOJO_MAP_BUFFER_FLAG_NONE, &mapping));
       EXPECT_FALSE(mapping);
       break;
     }
     case DispatcherOp::ADD_AWAKABLE: {
       HandleSignalsState hss;
-      MojoResult r =
-          dispatcher->AddAwakable(&waiter, ~MOJO_HANDLE_SIGNAL_NONE, 0, &hss);
+      MojoResult r = dispatcher->AddAwakable(&waiter, 0, false,
+                                             ~MOJO_HANDLE_SIGNAL_NONE, &hss);
       EXPECT_TRUE(r == MOJO_RESULT_FAILED_PRECONDITION ||
                   r == MOJO_RESULT_INVALID_ARGUMENT);
       EXPECT_EQ(0u, hss.satisfied_signals);
       EXPECT_EQ(0u, hss.satisfiable_signals);
       break;
     }
     case DispatcherOp::REMOVE_AWAKABLE: {
       HandleSignalsState hss;
-      dispatcher->RemoveAwakable(&waiter, &hss);
+      dispatcher->RemoveAwakable(false, &waiter, 0, &hss);
       EXPECT_EQ(0u, hss.satisfied_signals);
       EXPECT_EQ(0u, hss.satisfiable_signals);
       break;
     }
     default:
       NOTREACHED();
       break;
   }
 
   // Always try to remove the waiter, in case we added it.
   HandleSignalsState hss;
-  dispatcher->RemoveAwakable(&waiter, &hss);
+  dispatcher->RemoveAwakable(false, &waiter, 0, &hss);
   EXPECT_EQ(0u, hss.satisfied_signals);
   EXPECT_EQ(0u, hss.satisfiable_signals);
 }
 
 TEST(DispatcherTest, ThreadSafetyStress) {
   static const size_t kRepeatCount = 20;
   static const size_t kNumThreads = 100;
 
   for (size_t i = 0; i < kRepeatCount; i++) {
     // Manual reset, not initially signaled.
@@ skipping 44 matching lines @@
     for (auto& thread : threads)
       thread.join();
 
     EXPECT_EQ(MOJO_RESULT_OK, d->Close());
   }
 }
 
 }  // namespace
 }  // namespace system
 }  // namespace mojo