summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Andreas Gampe <agampe@google.com> 2014-11-26 17:52:32 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2014-11-26 17:52:32 +0000
commitf2611341d2e45144edd25c90f66834687a043dcc (patch)
tree0f0626da9599ed73e18805e44a630c7664967c6a
parente4b9435f53f108ede0cee74295bfd5d519491d51 (diff)
parenta1785c5cd88f6256a838a95c93ac0a1bee6c5145 (diff)
Merge "ART: Use Overwrite instead of Put"
-rw-r--r--runtime/trace.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/runtime/trace.cc b/runtime/trace.cc
index 2cc50b3732..b5108443b0 100644
--- a/runtime/trace.cc
+++ b/runtime/trace.cc
@@ -735,7 +735,9 @@ void Trace::StoreExitingThreadInfo(Thread* thread) {
if (the_trace_ != nullptr) {
std::string name;
thread->GetThreadName(name);
- the_trace_->exited_threads_.Put(thread->GetTid(), name);
+ // The same thread/tid may be used multiple times. As SafeMap::Put does not allow to override
+ // a previous mapping, use SafeMap::Overwrite.
+ the_trace_->exited_threads_.Overwrite(thread->GetTid(), name);
}
}