Add different behavior to AwakableList for "persistent" vs "one-shot" awakables.

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 375 matching lines @@
 }
 
 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,
+                                         bool persistent,
                                          MojoHandleSignals signals,
                                          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, context, signals);
+    if (persistent)
+      producer_awakable_list_->Add(awakable, context, persistent, signals);
     return MOJO_RESULT_ALREADY_EXISTS;
   }
   if (!producer_state.can_satisfy(signals)) {
-    if (force)
-      producer_awakable_list_->Add(awakable, context, signals);
+    if (persistent)
+      producer_awakable_list_->Add(awakable, context, persistent, signals);
     return MOJO_RESULT_FAILED_PRECONDITION;
   }
 
-  producer_awakable_list_->Add(awakable, context, signals);
+  producer_awakable_list_->Add(awakable, context, persistent, signals);
   return MOJO_RESULT_OK;
 }
 
 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(match_context, awakable, context);
@@ skipping 173 matching lines @@
 }
 
 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,
+                                         bool persistent,
                                          MojoHandleSignals signals,
                                          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, context, signals);
+    if (persistent)
+      consumer_awakable_list_->Add(awakable, context, persistent, signals);
     return MOJO_RESULT_ALREADY_EXISTS;
   }
   if (!consumer_state.can_satisfy(signals)) {
-    if (force)
-      consumer_awakable_list_->Add(awakable, context, signals);
+    if (persistent)
+      consumer_awakable_list_->Add(awakable, context, persistent, signals);
     return MOJO_RESULT_FAILED_PRECONDITION;
   }
 
-  consumer_awakable_list_->Add(awakable, context, signals);
+  consumer_awakable_list_->Add(awakable, context, persistent, signals);
   return MOJO_RESULT_OK;
 }
 
 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(match_context, awakable, context);
@@ skipping 71 matching lines @@
   impl_->set_owner(nullptr);
   std::unique_ptr<DataPipeImpl> rv(std::move(impl_));
   impl_ = std::move(new_impl);
   impl_->set_owner(this);
   return rv;
 }
 
 void DataPipe::ProducerCancelAllStateNoLock() {
   DCHECK(has_local_producer_no_lock());
   if (producer_awakable_list_)
-    producer_awakable_list_->CancelAll();
+    producer_awakable_list_->CancelAndRemoveAll();
   // Not a bug, except possibly in "user" code.
   DVLOG_IF(2, producer_in_two_phase_write_no_lock())
       << "Active two-phase write cancelled";
   producer_two_phase_max_num_bytes_written_ = 0;
 }
 
 void DataPipe::ConsumerCancelAllStateNoLock() {
   DCHECK(has_local_consumer_no_lock());
   if (consumer_awakable_list_)
-    consumer_awakable_list_->CancelAll();
+    consumer_awakable_list_->CancelAndRemoveAll();
   // Not a bug, except possibly in "user" code.
   DVLOG_IF(2, consumer_in_two_phase_read_no_lock())
       << "Active two-phase read cancelled";
   consumer_two_phase_max_num_bytes_read_ = 0;
 }
 
 void DataPipe::SetProducerClosedNoLock() {
   mutex_.AssertHeld();
   DCHECK(!has_local_producer_no_lock());
   DCHECK(producer_open_);
@@ skipping 100 matching lines @@
   SetProducerClosedNoLock();
 }
 
 void DataPipe::SetConsumerClosed() {
   MutexLocker locker(&mutex_);
   SetConsumerClosedNoLock();
 }
 
 }  // namespace system
 }  // namespace mojo