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

mojo/edk/system/core.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/core.h"
 
 #include <limits>
 #include <memory>
 #include <utility>
 #include <vector>
@@ skipping 129 matching lines @@
 MojoResult Core::AsyncWait(MojoHandle handle,
                            MojoHandleSignals signals,
                            const std::function<void(MojoResult)>& callback) {
   RefPtr<Dispatcher> dispatcher;
   MojoResult result = GetDispatcherAndCheckRights(
       handle, MOJO_HANDLE_RIGHT_NONE, EntrypointClass::NONE, &dispatcher);
   if (result != MOJO_RESULT_OK)
     return result;
 
   std::unique_ptr<AsyncWaiter> waiter(new AsyncWaiter(callback));
-  result = dispatcher->AddAwakable(waiter.get(), signals, 0, nullptr);
+  result = dispatcher->AddAwakable(waiter.get(), 0, false, signals, nullptr);
   if (result == MOJO_RESULT_OK)
     ignore_result(waiter.release());
   return result;
 }
 
 MojoTimeTicks Core::GetTimeTicksNow() {
   return GetTimeTicks();
 }
 
 MojoResult Core::Close(MojoHandle handle) {
@@ skipping 584 matching lines @@
   return MOJO_RESULT_OK;
 }
 
 MojoResult Core::UnmapBuffer(UserPointer<void> buffer) {
   MutexLocker locker(&mapping_table_mutex_);
   return mapping_table_.RemoveMapping(buffer.GetPointerValue());
 }
 
 // Note: We allow |handles| to repeat the same handle multiple times, since
 // different flags may be specified.
-// TODO(vtl): This incurs a performance cost in |Remove()|. Analyze this
-// more carefully and address it if necessary.
 MojoResult Core::WaitManyInternal(const MojoHandle* handles,
                                   const MojoHandleSignals* signals,
                                   uint32_t num_handles,
                                   MojoDeadline deadline,
                                   uint64_t* result_index,
                                   HandleSignalsState* signals_states) {
   DCHECK_GT(num_handles, 0u);
   DCHECK_EQ(*result_index, static_cast<uint64_t>(-1));
 
   DispatcherVector dispatchers;
@@ skipping 18 matching lines @@
   }
 
   // TODO(vtl): Should make the waiter live (permanently) in TLS.
   Waiter waiter;
   waiter.Init();
 
   uint32_t i;
   MojoResult result = MOJO_RESULT_OK;
   for (i = 0; i < num_handles; i++) {
     result = dispatchers[i]->AddAwakable(
-        &waiter, signals[i], i, signals_states ? &signals_states[i] : nullptr);
+        &waiter, i, false, signals[i],
+        signals_states ? &signals_states[i] : nullptr);
     if (result != MOJO_RESULT_OK) {
       *result_index = i;
       break;
     }
   }
   uint32_t num_added = i;
 
   if (result == MOJO_RESULT_ALREADY_EXISTS)
     result = MOJO_RESULT_OK;  // The i-th one is already "triggered".
   else if (result == MOJO_RESULT_OK)
     result = waiter.Wait(deadline, result_index, nullptr);
 
   // Make sure no other dispatchers try to wake |waiter| for the current
   // |Wait()|/|WaitMany()| call. (Only after doing this can |waiter| be
   // destroyed, but this would still be required if the waiter were in TLS.)
   for (i = 0; i < num_added; i++) {
     dispatchers[i]->RemoveAwakable(
-        &waiter, signals_states ? &signals_states[i] : nullptr);
+        false, &waiter, 0, signals_states ? &signals_states[i] : nullptr);
   }
   if (signals_states) {
     for (; i < num_handles; i++)
       signals_states[i] = dispatchers[i]->GetHandleSignalsState();
   }
 
   return result;
 }
 
 }  // namespace system
 }  // namespace mojo