Avoid debug check violation in thread registration.
Bug: 13757855
Change-Id: Ied83a7fc43e2b9a89a8b99aa4f74069ef8a369b1
diff --git a/runtime/thread_list.cc b/runtime/thread_list.cc
index 0933780..7de9433 100644
--- a/runtime/thread_list.cc
+++ b/runtime/thread_list.cc
@@ -750,14 +750,13 @@
MutexLock mu(self, *Locks::thread_list_lock_);
MutexLock mu2(self, *Locks::thread_suspend_count_lock_);
CHECK_GE(suspend_all_count_, debug_suspend_all_count_);
- if (debug_suspend_all_count_ > 0) {
- self->ModifySuspendCount(self, debug_suspend_all_count_, true);
+ // Modify suspend count in increments of 1 to maintain invariants in ModifySuspendCount. While
+ // this isn't particularly efficient the suspend counts are most commonly 0 or 1.
+ for (int delta = debug_suspend_all_count_; delta > 0; delta--) {
+ self->ModifySuspendCount(self, +1, true);
}
- if (suspend_all_count_ > 0) {
- int delta = suspend_all_count_ - debug_suspend_all_count_;
- if (delta > 0) {
- self->ModifySuspendCount(self, delta, false);
- }
+ for (int delta = suspend_all_count_ - debug_suspend_all_count_; delta > 0; delta--) {
+ self->ModifySuspendCount(self, +1, false);
}
CHECK(!Contains(self));
list_.push_back(self);