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

mojo/edk/system/wait_set_dispatcher.cc

 // Copyright 2016 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/wait_set_dispatcher.h"
 
 #include <utility>
 
 #include "base/logging.h"
 #include "mojo/edk/system/configuration.h"
@@ skipping 258 matching lines @@
     return;
   }
 
   auto it = entries_.find(context);
   DCHECK(it != entries_.end());
   const auto& entry = it->second;
   // We should only ever get at most one "closed" (cancelled).
   DCHECK_NE(static_cast<int>(entry->trigger_state),
             static_cast<int>(Entry::TriggerState::CLOSED));
   switch (reason) {
+    case AwakeReason::CANCELLED:
+      if (entry->trigger_state == Entry::TriggerState::NOT_TRIGGERED) {
+        AddPossiblyTriggeredNoLock(entry.get(), Entry::TriggerState::CLOSED);
+      } else {
+        entry->trigger_state = Entry::TriggerState::CLOSED;
+      }
+      entry->dispatcher = nullptr;
+      break;
     case AwakeReason::SATISFIED:
     case AwakeReason::UNSATISFIABLE:
       // We shouldn't see these since we're used as a persistent |Awakable|.
       NOTREACHED();
-    // Fall through.
+      break;
+    case AwakeReason::INITIALIZE:
+      // TODO(vtl): Save the initial state here (and maybe add to the triggered
+      // list), and then update state on CHANGED.
+      break;
     case AwakeReason::CHANGED:
       if (signals_state.satisfies(entry->signals)) {
         if (entry->trigger_state == Entry::TriggerState::NOT_TRIGGERED) {
           AddPossiblyTriggeredNoLock(entry.get(),
                                      Entry::TriggerState::SATISFIED);
         } else {
           entry->trigger_state = Entry::TriggerState::SATISFIED;
         }
       } else if (!signals_state.can_satisfy(entry->signals)) {
         if (entry->trigger_state == Entry::TriggerState::NOT_TRIGGERED) {
           AddPossiblyTriggeredNoLock(entry.get(),
                                      Entry::TriggerState::UNSATISFIABLE);
         } else {
           entry->trigger_state = Entry::TriggerState::UNSATISFIABLE;
         }
       } else {
         if (entry->trigger_state != Entry::TriggerState::NOT_TRIGGERED)
           RemovePossiblyTriggeredNoLock(entry.get());
       }
       break;
-    case AwakeReason::CANCELLED:
-      if (entry->trigger_state == Entry::TriggerState::NOT_TRIGGERED) {
-        AddPossiblyTriggeredNoLock(entry.get(), Entry::TriggerState::CLOSED);
-      } else {
-        entry->trigger_state = Entry::TriggerState::CLOSED;
-      }
-      entry->dispatcher = nullptr;
-      break;
   }
 }
 
 void WaitSetDispatcher::AddPossiblyTriggeredNoLock(
     Entry* entry,
     Entry::TriggerState new_trigger_state) {
   DCHECK_EQ(static_cast<int>(entry->trigger_state),
             static_cast<int>(Entry::TriggerState::NOT_TRIGGERED));
   DCHECK(!entry->possibly_triggered_previous);
   DCHECK(!entry->possibly_triggered_next);
@@ skipping 38 matching lines @@
     entry->possibly_triggered_next->possibly_triggered_previous =
         entry->possibly_triggered_previous;
   }
 
   entry->possibly_triggered_previous = nullptr;
   entry->possibly_triggered_next = nullptr;
 }
 
 }  // namespace system
 }  // namespace mojo