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

mojo/edk/system/data_pipe.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/data_pipe.h"
 
 #include <string.h>
 
 #include <algorithm>
 #include <limits>
@@ skipping 374 matching lines @@
   return rv;
 }
 
 HandleSignalsState DataPipe::ProducerGetHandleSignalsState() {
   MutexLocker locker(&mutex_);
   DCHECK(has_local_producer_no_lock());
   return impl_->ProducerGetHandleSignalsState();
 }
 
 MojoResult DataPipe::ProducerAddAwakable(Awakable* awakable,
+                                         uint64_t context,
+                                         bool force,
                                          MojoHandleSignals signals,
-                                         bool force,
-                                         uint64_t context,
                                          HandleSignalsState* signals_state) {
   MutexLocker locker(&mutex_);
   DCHECK(has_local_producer_no_lock());
 
   HandleSignalsState producer_state = impl_->ProducerGetHandleSignalsState();
   if (signals_state)
     *signals_state = producer_state;
   if (producer_state.satisfies(signals)) {
     if (force)
-      producer_awakable_list_->Add(awakable, signals, context);
+      producer_awakable_list_->Add(awakable, context, signals);
     return MOJO_RESULT_ALREADY_EXISTS;
   }
-  if (!producer_state.can_satisfy(signals))
+  if (!producer_state.can_satisfy(signals)) {
+    if (force)
+      producer_awakable_list_->Add(awakable, context, signals);
     return MOJO_RESULT_FAILED_PRECONDITION;
+  }
 
-  producer_awakable_list_->Add(awakable, signals, context);
+  producer_awakable_list_->Add(awakable, context, signals);
   return MOJO_RESULT_OK;
 }
 
-void DataPipe::ProducerRemoveAwakable(Awakable* awakable,
+void DataPipe::ProducerRemoveAwakable(bool match_context,
+                                      Awakable* awakable,
+                                      uint64_t context,
                                       HandleSignalsState* signals_state) {
   MutexLocker locker(&mutex_);
   DCHECK(has_local_producer_no_lock());
-  producer_awakable_list_->Remove(awakable);
+  producer_awakable_list_->Remove(match_context, awakable, context);
   if (signals_state)
     *signals_state = impl_->ProducerGetHandleSignalsState();
 }
-
-void DataPipe::ProducerRemoveAwakableWithContext(
-    Awakable* awakable,
-    uint64_t context,
-    HandleSignalsState* signals_state) {
-  MutexLocker locker(&mutex_);
-  DCHECK(has_local_producer_no_lock());
-  producer_awakable_list_->RemoveWithContext(awakable, context);
-  if (signals_state)
-    *signals_state = impl_->ProducerGetHandleSignalsState();
-}
 
 void DataPipe::ProducerStartSerialize(Channel* channel,
                                       size_t* max_size,
                                       size_t* max_platform_handles) {
   MutexLocker locker(&mutex_);
   DCHECK(has_local_producer_no_lock());
   impl_->ProducerStartSerialize(channel, max_size, max_platform_handles);
 }
 
 bool DataPipe::ProducerEndSerialize(
@@ skipping 159 matching lines @@
   return rv;
 }
 
 HandleSignalsState DataPipe::ConsumerGetHandleSignalsState() {
   MutexLocker locker(&mutex_);
   DCHECK(has_local_consumer_no_lock());
   return impl_->ConsumerGetHandleSignalsState();
 }
 
 MojoResult DataPipe::ConsumerAddAwakable(Awakable* awakable,
+                                         uint64_t context,
+                                         bool force,
                                          MojoHandleSignals signals,
-                                         bool force,
-                                         uint64_t context,
                                          HandleSignalsState* signals_state) {
   MutexLocker locker(&mutex_);
   DCHECK(has_local_consumer_no_lock());
 
   HandleSignalsState consumer_state = impl_->ConsumerGetHandleSignalsState();
   if (signals_state)
     *signals_state = consumer_state;
   if (consumer_state.satisfies(signals)) {
     if (force)
-      consumer_awakable_list_->Add(awakable, signals, context);
+      consumer_awakable_list_->Add(awakable, context, signals);
     return MOJO_RESULT_ALREADY_EXISTS;
   }
-  if (!consumer_state.can_satisfy(signals))
+  if (!consumer_state.can_satisfy(signals)) {
+    if (force)
+      consumer_awakable_list_->Add(awakable, context, signals);
     return MOJO_RESULT_FAILED_PRECONDITION;
+  }
 
-  consumer_awakable_list_->Add(awakable, signals, context);
+  consumer_awakable_list_->Add(awakable, context, signals);
   return MOJO_RESULT_OK;
 }
 
-void DataPipe::ConsumerRemoveAwakable(Awakable* awakable,
+void DataPipe::ConsumerRemoveAwakable(bool match_context,
+                                      Awakable* awakable,
+                                      uint64_t context,
                                       HandleSignalsState* signals_state) {
   MutexLocker locker(&mutex_);
   DCHECK(has_local_consumer_no_lock());
-  consumer_awakable_list_->Remove(awakable);
+  consumer_awakable_list_->Remove(match_context, awakable, context);
   if (signals_state)
     *signals_state = impl_->ConsumerGetHandleSignalsState();
 }
-
-void DataPipe::ConsumerRemoveAwakableWithContext(
-    Awakable* awakable,
-    uint64_t context,
-    HandleSignalsState* signals_state) {
-  MutexLocker locker(&mutex_);
-  DCHECK(has_local_consumer_no_lock());
-  consumer_awakable_list_->RemoveWithContext(awakable, context);
-  if (signals_state)
-    *signals_state = impl_->ConsumerGetHandleSignalsState();
-}
 
 void DataPipe::ConsumerStartSerialize(Channel* channel,
                                       size_t* max_size,
                                       size_t* max_platform_handles) {
   MutexLocker locker(&mutex_);
   DCHECK(has_local_consumer_no_lock());
   impl_->ConsumerStartSerialize(channel, max_size, max_platform_handles);
 }
 
 bool DataPipe::ConsumerEndSerialize(
@@ skipping 189 matching lines @@
   SetProducerClosedNoLock();
 }
 
 void DataPipe::SetConsumerClosed() {
   MutexLocker locker(&mutex_);
   SetConsumerClosedNoLock();
 }
 
 }  // namespace system
 }  // namespace mojo