diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2013-09-17 14:18:21 -0700 |
|---|---|---|
| committer | Mathieu Chartier <mathieuc@google.com> | 2013-09-17 14:18:21 -0700 |
| commit | b307052d619ec757478951fc026e6230c92e3b36 (patch) | |
| tree | 7fee60cf62ec02fab20f70f111b5925be8a772fa /runtime/intern_table.h | |
| parent | cb135ad769a5368f6ceb8caf25105a95580cbd6a (diff) | |
| parent | 613eae4a6f75282c0737a84850418afcab54d4e8 (diff) | |
| download | art-b307052d619ec757478951fc026e6230c92e3b36.zip art-b307052d619ec757478951fc026e6230c92e3b36.tar.gz art-b307052d619ec757478951fc026e6230c92e3b36.tar.bz2 | |
resolved conflicts for merge of 613eae4a to dalvik-dev
Change-Id: I61734cbf585decf9a50ba23f008b341d025339ff
Diffstat (limited to 'runtime/intern_table.h')
| -rw-r--r-- | runtime/intern_table.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/runtime/intern_table.h b/runtime/intern_table.h index a804d1f..07615dc 100644 --- a/runtime/intern_table.h +++ b/runtime/intern_table.h @@ -62,15 +62,10 @@ class InternTable { size_t Size() const; - void VisitRoots(RootVisitor* visitor, void* arg, bool clean_dirty); + void VisitRoots(RootVisitor* visitor, void* arg, bool only_dirty, bool clean_dirty); void DumpForSigQuit(std::ostream& os) const; - bool IsDirty() const { return is_dirty_; } - void Dirty() { - is_dirty_ = true; - } - private: typedef std::multimap<int32_t, mirror::String*> Table; @@ -83,7 +78,7 @@ class InternTable { void Remove(Table& table, const mirror::String* s, uint32_t hash_code); mutable Mutex intern_table_lock_; - bool is_dirty_; + bool is_dirty_ GUARDED_BY(intern_table_lock_); Table strong_interns_ GUARDED_BY(intern_table_lock_); Table weak_interns_ GUARDED_BY(intern_table_lock_); }; |