From 9e2094f921b63582e84d65849b1c5c6dc4d22b44 Mon Sep 17 00:00:00 2001 From: Mathieu Chartier Date: Thu, 11 Dec 2014 18:43:48 -0800 Subject: Add ReferenceQueue test Also cleaned up reference queue. TODO: Add tests for missing functionality. Bug: 10808403 Change-Id: I182f9cb69022fe542ea9e53d4c6d35cff90af332 --- runtime/gc/reference_queue.cc | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) (limited to 'runtime/gc/reference_queue.cc') diff --git a/runtime/gc/reference_queue.cc b/runtime/gc/reference_queue.cc index 4003524e5e..f4efe3c823 100644 --- a/runtime/gc/reference_queue.cc +++ b/runtime/gc/reference_queue.cc @@ -91,15 +91,30 @@ mirror::Reference* ReferenceQueue::DequeuePendingReference() { void ReferenceQueue::Dump(std::ostream& os) const { mirror::Reference* cur = list_; os << "Reference starting at list_=" << list_ << "\n"; - while (cur != nullptr) { + if (cur == nullptr) { + return; + } + do { mirror::Reference* pending_next = cur->GetPendingNext(); - os << "PendingNext=" << pending_next; + os << "Reference= " << cur << " PendingNext=" << pending_next; if (cur->IsFinalizerReferenceInstance()) { os << " Zombie=" << cur->AsFinalizerReference()->GetZombie(); } os << "\n"; cur = pending_next; + } while (cur != list_); +} + +size_t ReferenceQueue::GetLength() const { + size_t count = 0; + mirror::Reference* cur = list_; + if (cur != nullptr) { + do { + ++count; + cur = cur->GetPendingNext(); + } while (cur != list_); } + return count; } void ReferenceQueue::ClearWhiteReferences(ReferenceQueue* cleared_references, -- cgit v1.2.3-59-g8ed1b