| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "mojo/edk/system/awakable_list.h" | 5 #include "mojo/edk/system/awakable_list.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "mojo/edk/system/awakable.h" | 10 #include "mojo/edk/system/awakable.h" |
| 11 #include "mojo/edk/system/handle_signals_state.h" | 11 #include "mojo/edk/system/handle_signals_state.h" |
| 12 | 12 |
| 13 namespace mojo { | 13 namespace mojo { |
| 14 namespace system { | 14 namespace system { |
| 15 | 15 |
| 16 AwakableList::AwakableList() { | 16 AwakableList::AwakableList() { |
| 17 } | 17 } |
| 18 | 18 |
| 19 AwakableList::~AwakableList() { | 19 AwakableList::~AwakableList() { |
| 20 DCHECK(awakables_.empty()); | 20 DCHECK(awakables_.empty()); |
| 21 } | 21 } |
| 22 | 22 |
| 23 void AwakableList::AwakeForStateChange(const HandleSignalsState& state) { | 23 void AwakableList::OnStateChange(const HandleSignalsState& old_state, |
| 24 const HandleSignalsState& new_state) { |
| 24 // Instead of deleting elements in-place, swap them with the last element and | 25 // Instead of deleting elements in-place, swap them with the last element and |
| 25 // erase the elements from the end. | 26 // erase the elements from the end. |
| 26 auto last = awakables_.end(); | 27 auto last = awakables_.end(); |
| 27 for (AwakeInfoList::iterator it = awakables_.begin(); it != last;) { | 28 for (AwakeInfoList::iterator it = awakables_.begin(); it != last;) { |
| 28 bool keep = true; | 29 bool keep = true; |
| 29 if (state.satisfies(it->signals)) | 30 if (new_state.satisfies(it->signals) && !old_state.satisfies(it->signals)) |
| 30 keep = it->awakable->Awake(MOJO_RESULT_OK, it->context); | 31 keep = it->awakable->Awake(MOJO_RESULT_OK, it->context); |
| 31 else if (!state.can_satisfy(it->signals)) | 32 else if (!new_state.can_satisfy(it->signals) && |
| 33 old_state.can_satisfy(it->signals)) |
| 32 keep = it->awakable->Awake(MOJO_RESULT_FAILED_PRECONDITION, it->context); | 34 keep = it->awakable->Awake(MOJO_RESULT_FAILED_PRECONDITION, it->context); |
| 33 | 35 |
| 34 if (!keep) { | 36 if (!keep) { |
| 35 --last; | 37 --last; |
| 36 std::swap(*it, *last); | 38 std::swap(*it, *last); |
| 37 } else { | 39 } else { |
| 38 ++it; | 40 ++it; |
| 39 } | 41 } |
| 40 } | 42 } |
| 41 awakables_.erase(last, awakables_.end()); | 43 awakables_.erase(last, awakables_.end()); |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 80 std::swap(*it, *last); | 82 std::swap(*it, *last); |
| 81 } else { | 83 } else { |
| 82 ++it; | 84 ++it; |
| 83 } | 85 } |
| 84 } | 86 } |
| 85 awakables_.erase(last, awakables_.end()); | 87 awakables_.erase(last, awakables_.end()); |
| 86 } | 88 } |
| 87 | 89 |
| 88 } // namespace system | 90 } // namespace system |
| 89 } // namespace mojo | 91 } // namespace mojo |
| OLD | NEW |