AwakableList: For persistent awakables, make Add() call Awake() with reason INITIALIZE.

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 384 matching lines @@
                                          uint64_t context,
                                          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 (persistent)
-      producer_awakable_list_->Add(awakable, context, persistent, signals);
-    return MOJO_RESULT_ALREADY_EXISTS;
+  MojoResult rv = MOJO_RESULT_OK;
+  bool should_add = persistent;
+  if (producer_state.satisfies(signals))
+    rv = MOJO_RESULT_ALREADY_EXISTS;
+  else if (!producer_state.can_satisfy(signals))
+    rv = MOJO_RESULT_FAILED_PRECONDITION;
+  else
+    should_add = true;
+
+  if (should_add) {
+    producer_awakable_list_->Add(awakable, context, persistent, signals,
+                                 producer_state);
   }
-  if (!producer_state.can_satisfy(signals)) {
-    if (persistent)
-      producer_awakable_list_->Add(awakable, context, persistent, signals);
-    return MOJO_RESULT_FAILED_PRECONDITION;
-  }
-
-  producer_awakable_list_->Add(awakable, context, persistent, signals);
-  return MOJO_RESULT_OK;
+  return rv;
 }
 
 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);
   if (signals_state)
@@ skipping 181 matching lines @@
                                          uint64_t context,
                                          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 (persistent)
-      consumer_awakable_list_->Add(awakable, context, persistent, signals);
-    return MOJO_RESULT_ALREADY_EXISTS;
+  MojoResult rv = MOJO_RESULT_OK;
+  bool should_add = persistent;
+  if (consumer_state.satisfies(signals))
+    rv = MOJO_RESULT_ALREADY_EXISTS;
+  else if (!consumer_state.can_satisfy(signals))
+    rv = MOJO_RESULT_FAILED_PRECONDITION;
+  else
+    should_add = true;
+
+  if (should_add) {
+    consumer_awakable_list_->Add(awakable, context, persistent, signals,
+                                 consumer_state);
   }
-  if (!consumer_state.can_satisfy(signals)) {
-    if (persistent)
-      consumer_awakable_list_->Add(awakable, context, persistent, signals);
-    return MOJO_RESULT_FAILED_PRECONDITION;
-  }
-
-  consumer_awakable_list_->Add(awakable, context, persistent, signals);
-  return MOJO_RESULT_OK;
+  return rv;
 }
 
 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);
   if (signals_state)
@@ skipping 201 matching lines @@
   SetProducerClosedNoLock();
 }
 
 void DataPipe::SetConsumerClosed() {
   MutexLocker locker(&mutex_);
   SetConsumerClosedNoLock();
 }
 
 }  // namespace system
 }  // namespace mojo