Elliott Hughes | 2faa5f1 | 2012-01-30 14:42:07 -0800 | [diff] [blame] | 1 | /* |
| 2 | * Copyright (C) 2011 The Android Open Source Project |
| 3 | * |
| 4 | * Licensed under the Apache License, Version 2.0 (the "License"); |
| 5 | * you may not use this file except in compliance with the License. |
| 6 | * You may obtain a copy of the License at |
| 7 | * |
| 8 | * http://www.apache.org/licenses/LICENSE-2.0 |
| 9 | * |
| 10 | * Unless required by applicable law or agreed to in writing, software |
| 11 | * distributed under the License is distributed on an "AS IS" BASIS, |
| 12 | * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
| 13 | * See the License for the specific language governing permissions and |
| 14 | * limitations under the License. |
| 15 | */ |
Brian Carlstrom | 7e93b50 | 2011-08-04 14:16:22 -0700 | [diff] [blame] | 16 | |
| 17 | #include "intern_table.h" |
| 18 | |
Ian Rogers | 700a402 | 2014-05-19 16:49:03 -0700 | [diff] [blame] | 19 | #include <memory> |
| 20 | |
Mathieu Chartier | e401d14 | 2015-04-22 13:56:20 -0700 | [diff] [blame] | 21 | #include "gc_root-inl.h" |
Mathieu Chartier | 9750995 | 2015-07-13 14:35:43 -0700 | [diff] [blame] | 22 | #include "gc/collector/garbage_collector.h" |
Ian Rogers | 7dfb28c | 2013-08-22 08:18:36 -0700 | [diff] [blame] | 23 | #include "gc/space/image_space.h" |
Mathieu Chartier | 14c3bf9 | 2015-07-13 14:35:43 -0700 | [diff] [blame] | 24 | #include "gc/weak_root_state.h" |
Vladimir Marko | 05792b9 | 2015-08-03 11:56:49 +0100 | [diff] [blame] | 25 | #include "mirror/dex_cache-inl.h" |
Ian Rogers | 7dfb28c | 2013-08-22 08:18:36 -0700 | [diff] [blame] | 26 | #include "mirror/object_array-inl.h" |
| 27 | #include "mirror/object-inl.h" |
Mathieu Chartier | cdfd39f | 2014-08-29 18:16:58 -0700 | [diff] [blame] | 28 | #include "mirror/string-inl.h" |
Ian Rogers | 2dd0e2c | 2013-01-24 12:42:14 -0800 | [diff] [blame] | 29 | #include "thread.h" |
Elliott Hughes | 814e403 | 2011-08-23 12:07:56 -0700 | [diff] [blame] | 30 | #include "utf.h" |
Brian Carlstrom | 7e93b50 | 2011-08-04 14:16:22 -0700 | [diff] [blame] | 31 | |
| 32 | namespace art { |
| 33 | |
Ian Rogers | 7dfb28c | 2013-08-22 08:18:36 -0700 | [diff] [blame] | 34 | InternTable::InternTable() |
Mathieu Chartier | ea0831f | 2015-12-29 13:17:37 -0800 | [diff] [blame] | 35 | : images_added_to_intern_table_(false), |
| 36 | log_new_roots_(false), |
Mathieu Chartier | 14c3bf9 | 2015-07-13 14:35:43 -0700 | [diff] [blame] | 37 | weak_intern_condition_("New intern condition", *Locks::intern_table_lock_), |
| 38 | weak_root_state_(gc::kWeakRootStateNormal) { |
Mathieu Chartier | c11d9b8 | 2013-09-19 10:01:59 -0700 | [diff] [blame] | 39 | } |
Elliott Hughes | de69d7f | 2011-08-18 16:49:37 -0700 | [diff] [blame] | 40 | |
Brian Carlstrom | a663ea5 | 2011-08-19 23:33:41 -0700 | [diff] [blame] | 41 | size_t InternTable::Size() const { |
Sebastien Hertz | d2fe10a | 2014-01-15 10:20:56 +0100 | [diff] [blame] | 42 | MutexLock mu(Thread::Current(), *Locks::intern_table_lock_); |
Mathieu Chartier | eb175f7 | 2014-10-31 11:49:27 -0700 | [diff] [blame] | 43 | return strong_interns_.Size() + weak_interns_.Size(); |
Brian Carlstrom | a663ea5 | 2011-08-19 23:33:41 -0700 | [diff] [blame] | 44 | } |
| 45 | |
Hiroshi Yamauchi | a91a4bc | 2014-06-13 16:44:55 -0700 | [diff] [blame] | 46 | size_t InternTable::StrongSize() const { |
| 47 | MutexLock mu(Thread::Current(), *Locks::intern_table_lock_); |
Mathieu Chartier | eb175f7 | 2014-10-31 11:49:27 -0700 | [diff] [blame] | 48 | return strong_interns_.Size(); |
Hiroshi Yamauchi | a91a4bc | 2014-06-13 16:44:55 -0700 | [diff] [blame] | 49 | } |
| 50 | |
| 51 | size_t InternTable::WeakSize() const { |
| 52 | MutexLock mu(Thread::Current(), *Locks::intern_table_lock_); |
Mathieu Chartier | eb175f7 | 2014-10-31 11:49:27 -0700 | [diff] [blame] | 53 | return weak_interns_.Size(); |
Hiroshi Yamauchi | a91a4bc | 2014-06-13 16:44:55 -0700 | [diff] [blame] | 54 | } |
| 55 | |
Elliott Hughes | cac6cc7 | 2011-11-03 20:31:21 -0700 | [diff] [blame] | 56 | void InternTable::DumpForSigQuit(std::ostream& os) const { |
Mathieu Chartier | eb175f7 | 2014-10-31 11:49:27 -0700 | [diff] [blame] | 57 | os << "Intern table: " << StrongSize() << " strong; " << WeakSize() << " weak\n"; |
Elliott Hughes | cac6cc7 | 2011-11-03 20:31:21 -0700 | [diff] [blame] | 58 | } |
| 59 | |
Mathieu Chartier | bb87e0f | 2015-04-03 11:21:55 -0700 | [diff] [blame] | 60 | void InternTable::VisitRoots(RootVisitor* visitor, VisitRootFlags flags) { |
Sebastien Hertz | d2fe10a | 2014-01-15 10:20:56 +0100 | [diff] [blame] | 61 | MutexLock mu(Thread::Current(), *Locks::intern_table_lock_); |
Mathieu Chartier | 893263b | 2014-03-04 11:07:42 -0800 | [diff] [blame] | 62 | if ((flags & kVisitRootFlagAllRoots) != 0) { |
Mathieu Chartier | bb87e0f | 2015-04-03 11:21:55 -0700 | [diff] [blame] | 63 | strong_interns_.VisitRoots(visitor); |
Mathieu Chartier | 893263b | 2014-03-04 11:07:42 -0800 | [diff] [blame] | 64 | } else if ((flags & kVisitRootFlagNewRoots) != 0) { |
Mathieu Chartier | cdfd39f | 2014-08-29 18:16:58 -0700 | [diff] [blame] | 65 | for (auto& root : new_strong_intern_roots_) { |
| 66 | mirror::String* old_ref = root.Read<kWithoutReadBarrier>(); |
Mathieu Chartier | bb87e0f | 2015-04-03 11:21:55 -0700 | [diff] [blame] | 67 | root.VisitRoot(visitor, RootInfo(kRootInternedString)); |
Mathieu Chartier | cdfd39f | 2014-08-29 18:16:58 -0700 | [diff] [blame] | 68 | mirror::String* new_ref = root.Read<kWithoutReadBarrier>(); |
Mathieu Chartier | c2e2062 | 2014-11-03 11:41:47 -0800 | [diff] [blame] | 69 | if (new_ref != old_ref) { |
Mathieu Chartier | cdfd39f | 2014-08-29 18:16:58 -0700 | [diff] [blame] | 70 | // The GC moved a root in the log. Need to search the strong interns and update the |
Hiroshi Yamauchi | 94f7b49 | 2014-07-22 18:08:23 -0700 | [diff] [blame] | 71 | // corresponding object. This is slow, but luckily for us, this may only happen with a |
| 72 | // concurrent moving GC. |
Mathieu Chartier | eb175f7 | 2014-10-31 11:49:27 -0700 | [diff] [blame] | 73 | strong_interns_.Remove(old_ref); |
| 74 | strong_interns_.Insert(new_ref); |
Hiroshi Yamauchi | 94f7b49 | 2014-07-22 18:08:23 -0700 | [diff] [blame] | 75 | } |
| 76 | } |
Mathieu Chartier | 893263b | 2014-03-04 11:07:42 -0800 | [diff] [blame] | 77 | } |
Mathieu Chartier | 893263b | 2014-03-04 11:07:42 -0800 | [diff] [blame] | 78 | if ((flags & kVisitRootFlagClearRootLog) != 0) { |
| 79 | new_strong_intern_roots_.clear(); |
| 80 | } |
| 81 | if ((flags & kVisitRootFlagStartLoggingNewRoots) != 0) { |
| 82 | log_new_roots_ = true; |
| 83 | } else if ((flags & kVisitRootFlagStopLoggingNewRoots) != 0) { |
| 84 | log_new_roots_ = false; |
Ian Rogers | 1d54e73 | 2013-05-02 21:10:01 -0700 | [diff] [blame] | 85 | } |
Mathieu Chartier | 423d2a3 | 2013-09-12 17:33:56 -0700 | [diff] [blame] | 86 | // Note: we deliberately don't visit the weak_interns_ table and the immutable image roots. |
Brian Carlstrom | 7e93b50 | 2011-08-04 14:16:22 -0700 | [diff] [blame] | 87 | } |
| 88 | |
Mathieu Chartier | fbc3108 | 2016-01-24 11:59:56 -0800 | [diff] [blame] | 89 | mirror::String* InternTable::LookupWeak(Thread* self, mirror::String* s) { |
| 90 | MutexLock mu(self, *Locks::intern_table_lock_); |
| 91 | return LookupWeakLocked(s); |
Mathieu Chartier | f7fd970 | 2015-11-09 11:16:49 -0800 | [diff] [blame] | 92 | } |
| 93 | |
Mathieu Chartier | fbc3108 | 2016-01-24 11:59:56 -0800 | [diff] [blame] | 94 | mirror::String* InternTable::LookupStrong(Thread* self, mirror::String* s) { |
| 95 | MutexLock mu(self, *Locks::intern_table_lock_); |
| 96 | return LookupStrongLocked(s); |
| 97 | } |
| 98 | |
| 99 | mirror::String* InternTable::LookupWeakLocked(mirror::String* s) { |
Nicolas Geoffray | 1bc977c | 2016-01-23 14:15:49 +0000 | [diff] [blame] | 100 | return weak_interns_.Find(s); |
| 101 | } |
| 102 | |
Mathieu Chartier | fbc3108 | 2016-01-24 11:59:56 -0800 | [diff] [blame] | 103 | mirror::String* InternTable::LookupStrongLocked(mirror::String* s) { |
| 104 | return strong_interns_.Find(s); |
| 105 | } |
| 106 | |
Mathieu Chartier | ea0831f | 2015-12-29 13:17:37 -0800 | [diff] [blame] | 107 | void InternTable::AddNewTable() { |
Mathieu Chartier | eb175f7 | 2014-10-31 11:49:27 -0700 | [diff] [blame] | 108 | MutexLock mu(Thread::Current(), *Locks::intern_table_lock_); |
Mathieu Chartier | ea0831f | 2015-12-29 13:17:37 -0800 | [diff] [blame] | 109 | weak_interns_.AddNewTable(); |
| 110 | strong_interns_.AddNewTable(); |
Elliott Hughes | cf4c6c4 | 2011-09-01 15:16:42 -0700 | [diff] [blame] | 111 | } |
| 112 | |
Mathieu Chartier | cdfd39f | 2014-08-29 18:16:58 -0700 | [diff] [blame] | 113 | mirror::String* InternTable::InsertStrong(mirror::String* s) { |
Sebastien Hertz | d2fe10a | 2014-01-15 10:20:56 +0100 | [diff] [blame] | 114 | Runtime* runtime = Runtime::Current(); |
| 115 | if (runtime->IsActiveTransaction()) { |
Mathieu Chartier | cdfd39f | 2014-08-29 18:16:58 -0700 | [diff] [blame] | 116 | runtime->RecordStrongStringInsertion(s); |
Sebastien Hertz | d2fe10a | 2014-01-15 10:20:56 +0100 | [diff] [blame] | 117 | } |
Mathieu Chartier | 893263b | 2014-03-04 11:07:42 -0800 | [diff] [blame] | 118 | if (log_new_roots_) { |
Mathieu Chartier | cdfd39f | 2014-08-29 18:16:58 -0700 | [diff] [blame] | 119 | new_strong_intern_roots_.push_back(GcRoot<mirror::String>(s)); |
Mathieu Chartier | 893263b | 2014-03-04 11:07:42 -0800 | [diff] [blame] | 120 | } |
Mathieu Chartier | eb175f7 | 2014-10-31 11:49:27 -0700 | [diff] [blame] | 121 | strong_interns_.Insert(s); |
Mathieu Chartier | 893263b | 2014-03-04 11:07:42 -0800 | [diff] [blame] | 122 | return s; |
Sebastien Hertz | d2fe10a | 2014-01-15 10:20:56 +0100 | [diff] [blame] | 123 | } |
| 124 | |
Mathieu Chartier | cdfd39f | 2014-08-29 18:16:58 -0700 | [diff] [blame] | 125 | mirror::String* InternTable::InsertWeak(mirror::String* s) { |
Sebastien Hertz | d2fe10a | 2014-01-15 10:20:56 +0100 | [diff] [blame] | 126 | Runtime* runtime = Runtime::Current(); |
| 127 | if (runtime->IsActiveTransaction()) { |
Mathieu Chartier | cdfd39f | 2014-08-29 18:16:58 -0700 | [diff] [blame] | 128 | runtime->RecordWeakStringInsertion(s); |
Sebastien Hertz | d2fe10a | 2014-01-15 10:20:56 +0100 | [diff] [blame] | 129 | } |
Mathieu Chartier | eb175f7 | 2014-10-31 11:49:27 -0700 | [diff] [blame] | 130 | weak_interns_.Insert(s); |
Elliott Hughes | cf4c6c4 | 2011-09-01 15:16:42 -0700 | [diff] [blame] | 131 | return s; |
| 132 | } |
| 133 | |
Mathieu Chartier | cdfd39f | 2014-08-29 18:16:58 -0700 | [diff] [blame] | 134 | void InternTable::RemoveStrong(mirror::String* s) { |
Mathieu Chartier | eb175f7 | 2014-10-31 11:49:27 -0700 | [diff] [blame] | 135 | strong_interns_.Remove(s); |
Hiroshi Yamauchi | 1bd4872 | 2014-05-23 19:58:15 -0700 | [diff] [blame] | 136 | } |
| 137 | |
Mathieu Chartier | cdfd39f | 2014-08-29 18:16:58 -0700 | [diff] [blame] | 138 | void InternTable::RemoveWeak(mirror::String* s) { |
Sebastien Hertz | d2fe10a | 2014-01-15 10:20:56 +0100 | [diff] [blame] | 139 | Runtime* runtime = Runtime::Current(); |
| 140 | if (runtime->IsActiveTransaction()) { |
Mathieu Chartier | cdfd39f | 2014-08-29 18:16:58 -0700 | [diff] [blame] | 141 | runtime->RecordWeakStringRemoval(s); |
Sebastien Hertz | d2fe10a | 2014-01-15 10:20:56 +0100 | [diff] [blame] | 142 | } |
Mathieu Chartier | eb175f7 | 2014-10-31 11:49:27 -0700 | [diff] [blame] | 143 | weak_interns_.Remove(s); |
Brian Carlstrom | 7e93b50 | 2011-08-04 14:16:22 -0700 | [diff] [blame] | 144 | } |
| 145 | |
Sebastien Hertz | d2fe10a | 2014-01-15 10:20:56 +0100 | [diff] [blame] | 146 | // Insert/remove methods used to undo changes made during an aborted transaction. |
Mathieu Chartier | cdfd39f | 2014-08-29 18:16:58 -0700 | [diff] [blame] | 147 | mirror::String* InternTable::InsertStrongFromTransaction(mirror::String* s) { |
Sebastien Hertz | d2fe10a | 2014-01-15 10:20:56 +0100 | [diff] [blame] | 148 | DCHECK(!Runtime::Current()->IsActiveTransaction()); |
Mathieu Chartier | cdfd39f | 2014-08-29 18:16:58 -0700 | [diff] [blame] | 149 | return InsertStrong(s); |
Sebastien Hertz | d2fe10a | 2014-01-15 10:20:56 +0100 | [diff] [blame] | 150 | } |
Mathieu Chartier | cdfd39f | 2014-08-29 18:16:58 -0700 | [diff] [blame] | 151 | mirror::String* InternTable::InsertWeakFromTransaction(mirror::String* s) { |
Sebastien Hertz | d2fe10a | 2014-01-15 10:20:56 +0100 | [diff] [blame] | 152 | DCHECK(!Runtime::Current()->IsActiveTransaction()); |
Mathieu Chartier | cdfd39f | 2014-08-29 18:16:58 -0700 | [diff] [blame] | 153 | return InsertWeak(s); |
Sebastien Hertz | d2fe10a | 2014-01-15 10:20:56 +0100 | [diff] [blame] | 154 | } |
Mathieu Chartier | cdfd39f | 2014-08-29 18:16:58 -0700 | [diff] [blame] | 155 | void InternTable::RemoveStrongFromTransaction(mirror::String* s) { |
Sebastien Hertz | d2fe10a | 2014-01-15 10:20:56 +0100 | [diff] [blame] | 156 | DCHECK(!Runtime::Current()->IsActiveTransaction()); |
Mathieu Chartier | cdfd39f | 2014-08-29 18:16:58 -0700 | [diff] [blame] | 157 | RemoveStrong(s); |
Sebastien Hertz | d2fe10a | 2014-01-15 10:20:56 +0100 | [diff] [blame] | 158 | } |
Mathieu Chartier | cdfd39f | 2014-08-29 18:16:58 -0700 | [diff] [blame] | 159 | void InternTable::RemoveWeakFromTransaction(mirror::String* s) { |
Sebastien Hertz | d2fe10a | 2014-01-15 10:20:56 +0100 | [diff] [blame] | 160 | DCHECK(!Runtime::Current()->IsActiveTransaction()); |
Mathieu Chartier | cdfd39f | 2014-08-29 18:16:58 -0700 | [diff] [blame] | 161 | RemoveWeak(s); |
Sebastien Hertz | d2fe10a | 2014-01-15 10:20:56 +0100 | [diff] [blame] | 162 | } |
| 163 | |
Mathieu Chartier | 205b762 | 2016-01-06 15:47:09 -0800 | [diff] [blame] | 164 | void InternTable::AddImagesStringsToTable(const std::vector<gc::space::ImageSpace*>& image_spaces) { |
Mathieu Chartier | eb175f7 | 2014-10-31 11:49:27 -0700 | [diff] [blame] | 165 | MutexLock mu(Thread::Current(), *Locks::intern_table_lock_); |
Mathieu Chartier | 205b762 | 2016-01-06 15:47:09 -0800 | [diff] [blame] | 166 | for (gc::space::ImageSpace* image_space : image_spaces) { |
| 167 | const ImageHeader* const header = &image_space->GetImageHeader(); |
| 168 | // Check if we have the interned strings section. |
| 169 | const ImageSection& section = header->GetImageSection(ImageHeader::kSectionInternedStrings); |
| 170 | if (section.Size() > 0) { |
| 171 | AddTableFromMemoryLocked(image_space->Begin() + section.Offset()); |
| 172 | } else { |
| 173 | // TODO: Delete this logic? |
| 174 | mirror::Object* root = header->GetImageRoot(ImageHeader::kDexCaches); |
| 175 | mirror::ObjectArray<mirror::DexCache>* dex_caches = root->AsObjectArray<mirror::DexCache>(); |
| 176 | for (int32_t i = 0; i < dex_caches->GetLength(); ++i) { |
| 177 | mirror::DexCache* dex_cache = dex_caches->Get(i); |
| 178 | const size_t num_strings = dex_cache->NumStrings(); |
| 179 | for (size_t j = 0; j < num_strings; ++j) { |
| 180 | mirror::String* image_string = dex_cache->GetResolvedString(j); |
| 181 | if (image_string != nullptr) { |
Mathieu Chartier | fbc3108 | 2016-01-24 11:59:56 -0800 | [diff] [blame] | 182 | mirror::String* found = LookupStrongLocked(image_string); |
Mathieu Chartier | 205b762 | 2016-01-06 15:47:09 -0800 | [diff] [blame] | 183 | if (found == nullptr) { |
| 184 | InsertStrong(image_string); |
| 185 | } else { |
| 186 | DCHECK_EQ(found, image_string); |
| 187 | } |
Mathieu Chartier | eb175f7 | 2014-10-31 11:49:27 -0700 | [diff] [blame] | 188 | } |
| 189 | } |
| 190 | } |
| 191 | } |
Mathieu Chartier | eb175f7 | 2014-10-31 11:49:27 -0700 | [diff] [blame] | 192 | } |
Mathieu Chartier | ea0831f | 2015-12-29 13:17:37 -0800 | [diff] [blame] | 193 | images_added_to_intern_table_ = true; |
Mathieu Chartier | eb175f7 | 2014-10-31 11:49:27 -0700 | [diff] [blame] | 194 | } |
| 195 | |
Mathieu Chartier | 14c3bf9 | 2015-07-13 14:35:43 -0700 | [diff] [blame] | 196 | mirror::String* InternTable::LookupStringFromImage(mirror::String* s) { |
Mathieu Chartier | 205b762 | 2016-01-06 15:47:09 -0800 | [diff] [blame] | 197 | DCHECK(!images_added_to_intern_table_); |
Mathieu Chartier | ea0831f | 2015-12-29 13:17:37 -0800 | [diff] [blame] | 198 | const std::vector<gc::space::ImageSpace*>& image_spaces = |
Jeff Hao | dcdc85b | 2015-12-04 14:06:18 -0800 | [diff] [blame] | 199 | Runtime::Current()->GetHeap()->GetBootImageSpaces(); |
| 200 | if (image_spaces.empty()) { |
Mathieu Chartier | eb175f7 | 2014-10-31 11:49:27 -0700 | [diff] [blame] | 201 | return nullptr; // No image present. |
Ian Rogers | 7dfb28c | 2013-08-22 08:18:36 -0700 | [diff] [blame] | 202 | } |
Ian Rogers | 7dfb28c | 2013-08-22 08:18:36 -0700 | [diff] [blame] | 203 | const std::string utf8 = s->ToModifiedUtf8(); |
Jeff Hao | dcdc85b | 2015-12-04 14:06:18 -0800 | [diff] [blame] | 204 | for (gc::space::ImageSpace* image_space : image_spaces) { |
| 205 | mirror::Object* root = image_space->GetImageHeader().GetImageRoot(ImageHeader::kDexCaches); |
| 206 | mirror::ObjectArray<mirror::DexCache>* dex_caches = root->AsObjectArray<mirror::DexCache>(); |
| 207 | for (int32_t i = 0; i < dex_caches->GetLength(); ++i) { |
| 208 | mirror::DexCache* dex_cache = dex_caches->Get(i); |
| 209 | const DexFile* dex_file = dex_cache->GetDexFile(); |
| 210 | // Binary search the dex file for the string index. |
| 211 | const DexFile::StringId* string_id = dex_file->FindStringId(utf8.c_str()); |
| 212 | if (string_id != nullptr) { |
| 213 | uint32_t string_idx = dex_file->GetIndexForStringId(*string_id); |
| 214 | // GetResolvedString() contains a RB. |
| 215 | mirror::String* image_string = dex_cache->GetResolvedString(string_idx); |
| 216 | if (image_string != nullptr) { |
| 217 | return image_string; |
| 218 | } |
Ian Rogers | 7dfb28c | 2013-08-22 08:18:36 -0700 | [diff] [blame] | 219 | } |
| 220 | } |
| 221 | } |
Mathieu Chartier | c2e2062 | 2014-11-03 11:41:47 -0800 | [diff] [blame] | 222 | return nullptr; |
Ian Rogers | 7dfb28c | 2013-08-22 08:18:36 -0700 | [diff] [blame] | 223 | } |
| 224 | |
Hiroshi Yamauchi | 0b71357 | 2015-06-16 18:29:23 -0700 | [diff] [blame] | 225 | void InternTable::BroadcastForNewInterns() { |
| 226 | CHECK(kUseReadBarrier); |
| 227 | Thread* self = Thread::Current(); |
| 228 | MutexLock mu(self, *Locks::intern_table_lock_); |
Mathieu Chartier | 14c3bf9 | 2015-07-13 14:35:43 -0700 | [diff] [blame] | 229 | weak_intern_condition_.Broadcast(self); |
Hiroshi Yamauchi | 0b71357 | 2015-06-16 18:29:23 -0700 | [diff] [blame] | 230 | } |
| 231 | |
Mathieu Chartier | 14c3bf9 | 2015-07-13 14:35:43 -0700 | [diff] [blame] | 232 | void InternTable::WaitUntilAccessible(Thread* self) { |
| 233 | Locks::intern_table_lock_->ExclusiveUnlock(self); |
Mathieu Chartier | f1d666e | 2015-09-03 16:13:34 -0700 | [diff] [blame] | 234 | { |
| 235 | ScopedThreadSuspension sts(self, kWaitingWeakGcRootRead); |
| 236 | MutexLock mu(self, *Locks::intern_table_lock_); |
| 237 | while (weak_root_state_ == gc::kWeakRootStateNoReadsOrWrites) { |
| 238 | weak_intern_condition_.Wait(self); |
| 239 | } |
Mathieu Chartier | 14c3bf9 | 2015-07-13 14:35:43 -0700 | [diff] [blame] | 240 | } |
Mathieu Chartier | 14c3bf9 | 2015-07-13 14:35:43 -0700 | [diff] [blame] | 241 | Locks::intern_table_lock_->ExclusiveLock(self); |
| 242 | } |
| 243 | |
| 244 | mirror::String* InternTable::Insert(mirror::String* s, bool is_strong, bool holding_locks) { |
Mathieu Chartier | c2e2062 | 2014-11-03 11:41:47 -0800 | [diff] [blame] | 245 | if (s == nullptr) { |
| 246 | return nullptr; |
| 247 | } |
Mathieu Chartier | 14c3bf9 | 2015-07-13 14:35:43 -0700 | [diff] [blame] | 248 | Thread* const self = Thread::Current(); |
Sebastien Hertz | d2fe10a | 2014-01-15 10:20:56 +0100 | [diff] [blame] | 249 | MutexLock mu(self, *Locks::intern_table_lock_); |
Mathieu Chartier | 14c3bf9 | 2015-07-13 14:35:43 -0700 | [diff] [blame] | 250 | if (kDebugLocking && !holding_locks) { |
| 251 | Locks::mutator_lock_->AssertSharedHeld(self); |
| 252 | CHECK_EQ(2u, self->NumberOfHeldMutexes()) << "may only safely hold the mutator lock"; |
Mathieu Chartier | c11d9b8 | 2013-09-19 10:01:59 -0700 | [diff] [blame] | 253 | } |
Mathieu Chartier | 14c3bf9 | 2015-07-13 14:35:43 -0700 | [diff] [blame] | 254 | while (true) { |
Mathieu Chartier | 90ef3db | 2015-08-04 15:19:41 -0700 | [diff] [blame] | 255 | if (holding_locks) { |
| 256 | if (!kUseReadBarrier) { |
| 257 | CHECK_EQ(weak_root_state_, gc::kWeakRootStateNormal); |
| 258 | } else { |
| 259 | CHECK(self->GetWeakRefAccessEnabled()); |
| 260 | } |
| 261 | } |
Mathieu Chartier | 14c3bf9 | 2015-07-13 14:35:43 -0700 | [diff] [blame] | 262 | // Check the strong table for a match. |
Mathieu Chartier | fbc3108 | 2016-01-24 11:59:56 -0800 | [diff] [blame] | 263 | mirror::String* strong = LookupStrongLocked(s); |
Mathieu Chartier | 14c3bf9 | 2015-07-13 14:35:43 -0700 | [diff] [blame] | 264 | if (strong != nullptr) { |
| 265 | return strong; |
| 266 | } |
Mathieu Chartier | 90ef3db | 2015-08-04 15:19:41 -0700 | [diff] [blame] | 267 | if ((!kUseReadBarrier && weak_root_state_ != gc::kWeakRootStateNoReadsOrWrites) || |
| 268 | (kUseReadBarrier && self->GetWeakRefAccessEnabled())) { |
| 269 | break; |
| 270 | } |
Mathieu Chartier | 14c3bf9 | 2015-07-13 14:35:43 -0700 | [diff] [blame] | 271 | // weak_root_state_ is set to gc::kWeakRootStateNoReadsOrWrites in the GC pause but is only |
| 272 | // cleared after SweepSystemWeaks has completed. This is why we need to wait until it is |
| 273 | // cleared. |
Mathieu Chartier | 14c3bf9 | 2015-07-13 14:35:43 -0700 | [diff] [blame] | 274 | CHECK(!holding_locks); |
| 275 | StackHandleScope<1> hs(self); |
| 276 | auto h = hs.NewHandleWrapper(&s); |
| 277 | WaitUntilAccessible(self); |
Elliott Hughes | cf4c6c4 | 2011-09-01 15:16:42 -0700 | [diff] [blame] | 278 | } |
Mathieu Chartier | 90ef3db | 2015-08-04 15:19:41 -0700 | [diff] [blame] | 279 | if (!kUseReadBarrier) { |
| 280 | CHECK_EQ(weak_root_state_, gc::kWeakRootStateNormal); |
| 281 | } else { |
| 282 | CHECK(self->GetWeakRefAccessEnabled()); |
| 283 | } |
Mathieu Chartier | c2e2062 | 2014-11-03 11:41:47 -0800 | [diff] [blame] | 284 | // There is no match in the strong table, check the weak table. |
Mathieu Chartier | fbc3108 | 2016-01-24 11:59:56 -0800 | [diff] [blame] | 285 | mirror::String* weak = LookupWeakLocked(s); |
Mathieu Chartier | c2e2062 | 2014-11-03 11:41:47 -0800 | [diff] [blame] | 286 | if (weak != nullptr) { |
| 287 | if (is_strong) { |
| 288 | // A match was found in the weak table. Promote to the strong table. |
| 289 | RemoveWeak(weak); |
| 290 | return InsertStrong(weak); |
| 291 | } |
Elliott Hughes | cf4c6c4 | 2011-09-01 15:16:42 -0700 | [diff] [blame] | 292 | return weak; |
| 293 | } |
nikolay serdjuk | a446d86 | 2015-04-17 19:27:56 +0600 | [diff] [blame] | 294 | // Check the image for a match. |
Mathieu Chartier | ea0831f | 2015-12-29 13:17:37 -0800 | [diff] [blame] | 295 | if (!images_added_to_intern_table_) { |
| 296 | mirror::String* const image_string = LookupStringFromImage(s); |
| 297 | if (image_string != nullptr) { |
| 298 | return is_strong ? InsertStrong(image_string) : InsertWeak(image_string); |
| 299 | } |
nikolay serdjuk | a446d86 | 2015-04-17 19:27:56 +0600 | [diff] [blame] | 300 | } |
Mathieu Chartier | c2e2062 | 2014-11-03 11:41:47 -0800 | [diff] [blame] | 301 | // No match in the strong table or the weak table. Insert into the strong / weak table. |
| 302 | return is_strong ? InsertStrong(s) : InsertWeak(s); |
Elliott Hughes | cf4c6c4 | 2011-09-01 15:16:42 -0700 | [diff] [blame] | 303 | } |
| 304 | |
Mathieu Chartier | ed0fc1d | 2014-03-21 14:09:35 -0700 | [diff] [blame] | 305 | mirror::String* InternTable::InternStrong(int32_t utf16_length, const char* utf8_data) { |
| 306 | DCHECK(utf8_data != nullptr); |
Ian Rogers | 7dfb28c | 2013-08-22 08:18:36 -0700 | [diff] [blame] | 307 | return InternStrong(mirror::String::AllocFromModifiedUtf8( |
| 308 | Thread::Current(), utf16_length, utf8_data)); |
Elliott Hughes | cf4c6c4 | 2011-09-01 15:16:42 -0700 | [diff] [blame] | 309 | } |
| 310 | |
Ian Rogers | 2dd0e2c | 2013-01-24 12:42:14 -0800 | [diff] [blame] | 311 | mirror::String* InternTable::InternStrong(const char* utf8_data) { |
Mathieu Chartier | ed0fc1d | 2014-03-21 14:09:35 -0700 | [diff] [blame] | 312 | DCHECK(utf8_data != nullptr); |
| 313 | return InternStrong(mirror::String::AllocFromModifiedUtf8(Thread::Current(), utf8_data)); |
Brian Carlstrom | c74255f | 2011-09-11 22:47:39 -0700 | [diff] [blame] | 314 | } |
| 315 | |
Mathieu Chartier | 90ef3db | 2015-08-04 15:19:41 -0700 | [diff] [blame] | 316 | mirror::String* InternTable::InternStrongImageString(mirror::String* s) { |
Mathieu Chartier | 14c3bf9 | 2015-07-13 14:35:43 -0700 | [diff] [blame] | 317 | // May be holding the heap bitmap lock. |
| 318 | return Insert(s, true, true); |
| 319 | } |
| 320 | |
Ian Rogers | 2dd0e2c | 2013-01-24 12:42:14 -0800 | [diff] [blame] | 321 | mirror::String* InternTable::InternStrong(mirror::String* s) { |
Mathieu Chartier | 14c3bf9 | 2015-07-13 14:35:43 -0700 | [diff] [blame] | 322 | return Insert(s, true, false); |
Brian Carlstrom | c74255f | 2011-09-11 22:47:39 -0700 | [diff] [blame] | 323 | } |
| 324 | |
Ian Rogers | 2dd0e2c | 2013-01-24 12:42:14 -0800 | [diff] [blame] | 325 | mirror::String* InternTable::InternWeak(mirror::String* s) { |
Mathieu Chartier | 14c3bf9 | 2015-07-13 14:35:43 -0700 | [diff] [blame] | 326 | return Insert(s, false, false); |
Elliott Hughes | cf4c6c4 | 2011-09-01 15:16:42 -0700 | [diff] [blame] | 327 | } |
| 328 | |
Ian Rogers | 2dd0e2c | 2013-01-24 12:42:14 -0800 | [diff] [blame] | 329 | bool InternTable::ContainsWeak(mirror::String* s) { |
Mathieu Chartier | fbc3108 | 2016-01-24 11:59:56 -0800 | [diff] [blame] | 330 | return LookupWeak(Thread::Current(), s) == s; |
Elliott Hughes | cf4c6c4 | 2011-09-01 15:16:42 -0700 | [diff] [blame] | 331 | } |
| 332 | |
Mathieu Chartier | 9750995 | 2015-07-13 14:35:43 -0700 | [diff] [blame] | 333 | void InternTable::SweepInternTableWeaks(IsMarkedVisitor* visitor) { |
Sebastien Hertz | d2fe10a | 2014-01-15 10:20:56 +0100 | [diff] [blame] | 334 | MutexLock mu(Thread::Current(), *Locks::intern_table_lock_); |
Mathieu Chartier | 9750995 | 2015-07-13 14:35:43 -0700 | [diff] [blame] | 335 | weak_interns_.SweepWeaks(visitor); |
Brian Carlstrom | a663ea5 | 2011-08-19 23:33:41 -0700 | [diff] [blame] | 336 | } |
| 337 | |
Mathieu Chartier | ea0831f | 2015-12-29 13:17:37 -0800 | [diff] [blame] | 338 | size_t InternTable::AddTableFromMemory(const uint8_t* ptr) { |
Mathieu Chartier | d39645e | 2015-06-09 17:50:29 -0700 | [diff] [blame] | 339 | MutexLock mu(Thread::Current(), *Locks::intern_table_lock_); |
Mathieu Chartier | ea0831f | 2015-12-29 13:17:37 -0800 | [diff] [blame] | 340 | return AddTableFromMemoryLocked(ptr); |
Mathieu Chartier | d39645e | 2015-06-09 17:50:29 -0700 | [diff] [blame] | 341 | } |
| 342 | |
Mathieu Chartier | ea0831f | 2015-12-29 13:17:37 -0800 | [diff] [blame] | 343 | size_t InternTable::AddTableFromMemoryLocked(const uint8_t* ptr) { |
| 344 | return strong_interns_.AddTableFromMemory(ptr); |
Mathieu Chartier | d39645e | 2015-06-09 17:50:29 -0700 | [diff] [blame] | 345 | } |
| 346 | |
| 347 | size_t InternTable::WriteToMemory(uint8_t* ptr) { |
| 348 | MutexLock mu(Thread::Current(), *Locks::intern_table_lock_); |
Mathieu Chartier | ea0831f | 2015-12-29 13:17:37 -0800 | [diff] [blame] | 349 | return strong_interns_.WriteToMemory(ptr); |
Mathieu Chartier | d39645e | 2015-06-09 17:50:29 -0700 | [diff] [blame] | 350 | } |
| 351 | |
Mathieu Chartier | c2e2062 | 2014-11-03 11:41:47 -0800 | [diff] [blame] | 352 | std::size_t InternTable::StringHashEquals::operator()(const GcRoot<mirror::String>& root) const { |
Mathieu Chartier | cdfd39f | 2014-08-29 18:16:58 -0700 | [diff] [blame] | 353 | if (kIsDebugBuild) { |
| 354 | Locks::mutator_lock_->AssertSharedHeld(Thread::Current()); |
| 355 | } |
Mathieu Chartier | c2e2062 | 2014-11-03 11:41:47 -0800 | [diff] [blame] | 356 | return static_cast<size_t>(root.Read()->GetHashCode()); |
Mathieu Chartier | cdfd39f | 2014-08-29 18:16:58 -0700 | [diff] [blame] | 357 | } |
| 358 | |
| 359 | bool InternTable::StringHashEquals::operator()(const GcRoot<mirror::String>& a, |
Mathieu Chartier | c2e2062 | 2014-11-03 11:41:47 -0800 | [diff] [blame] | 360 | const GcRoot<mirror::String>& b) const { |
Mathieu Chartier | cdfd39f | 2014-08-29 18:16:58 -0700 | [diff] [blame] | 361 | if (kIsDebugBuild) { |
| 362 | Locks::mutator_lock_->AssertSharedHeld(Thread::Current()); |
| 363 | } |
Mathieu Chartier | c2e2062 | 2014-11-03 11:41:47 -0800 | [diff] [blame] | 364 | return a.Read()->Equals(b.Read()); |
Mathieu Chartier | cdfd39f | 2014-08-29 18:16:58 -0700 | [diff] [blame] | 365 | } |
| 366 | |
Mathieu Chartier | ea0831f | 2015-12-29 13:17:37 -0800 | [diff] [blame] | 367 | size_t InternTable::Table::AddTableFromMemory(const uint8_t* ptr) { |
Mathieu Chartier | d39645e | 2015-06-09 17:50:29 -0700 | [diff] [blame] | 368 | size_t read_count = 0; |
Mathieu Chartier | ea0831f | 2015-12-29 13:17:37 -0800 | [diff] [blame] | 369 | UnorderedSet set(ptr, /*make copy*/false, &read_count); |
| 370 | // TODO: Disable this for app images if app images have intern tables. |
| 371 | static constexpr bool kCheckDuplicates = true; |
| 372 | if (kCheckDuplicates) { |
| 373 | for (GcRoot<mirror::String>& string : set) { |
| 374 | CHECK(Find(string.Read()) == nullptr) << "Already found " << string.Read()->ToModifiedUtf8(); |
| 375 | } |
| 376 | } |
| 377 | // Insert at the front since we insert into the back. |
| 378 | tables_.insert(tables_.begin(), std::move(set)); |
Mathieu Chartier | d39645e | 2015-06-09 17:50:29 -0700 | [diff] [blame] | 379 | return read_count; |
| 380 | } |
| 381 | |
Mathieu Chartier | ea0831f | 2015-12-29 13:17:37 -0800 | [diff] [blame] | 382 | size_t InternTable::Table::WriteToMemory(uint8_t* ptr) { |
| 383 | if (tables_.empty()) { |
| 384 | return 0; |
| 385 | } |
| 386 | UnorderedSet* table_to_write; |
| 387 | UnorderedSet combined; |
| 388 | if (tables_.size() > 1) { |
| 389 | table_to_write = &combined; |
| 390 | for (UnorderedSet& table : tables_) { |
| 391 | for (GcRoot<mirror::String>& string : table) { |
| 392 | combined.Insert(string); |
| 393 | } |
| 394 | } |
| 395 | } else { |
| 396 | table_to_write = &tables_.back(); |
| 397 | } |
| 398 | return table_to_write->WriteToMemory(ptr); |
Mathieu Chartier | d39645e | 2015-06-09 17:50:29 -0700 | [diff] [blame] | 399 | } |
| 400 | |
Mathieu Chartier | eb175f7 | 2014-10-31 11:49:27 -0700 | [diff] [blame] | 401 | void InternTable::Table::Remove(mirror::String* s) { |
Mathieu Chartier | ea0831f | 2015-12-29 13:17:37 -0800 | [diff] [blame] | 402 | for (UnorderedSet& table : tables_) { |
| 403 | auto it = table.Find(GcRoot<mirror::String>(s)); |
| 404 | if (it != table.end()) { |
| 405 | table.Erase(it); |
| 406 | return; |
| 407 | } |
Mathieu Chartier | eb175f7 | 2014-10-31 11:49:27 -0700 | [diff] [blame] | 408 | } |
Mathieu Chartier | ea0831f | 2015-12-29 13:17:37 -0800 | [diff] [blame] | 409 | LOG(FATAL) << "Attempting to remove non-interned string " << s->ToModifiedUtf8(); |
Mathieu Chartier | eb175f7 | 2014-10-31 11:49:27 -0700 | [diff] [blame] | 410 | } |
| 411 | |
| 412 | mirror::String* InternTable::Table::Find(mirror::String* s) { |
| 413 | Locks::intern_table_lock_->AssertHeld(Thread::Current()); |
Mathieu Chartier | ea0831f | 2015-12-29 13:17:37 -0800 | [diff] [blame] | 414 | for (UnorderedSet& table : tables_) { |
| 415 | auto it = table.Find(GcRoot<mirror::String>(s)); |
| 416 | if (it != table.end()) { |
| 417 | return it->Read(); |
| 418 | } |
Mathieu Chartier | eb175f7 | 2014-10-31 11:49:27 -0700 | [diff] [blame] | 419 | } |
| 420 | return nullptr; |
| 421 | } |
| 422 | |
Mathieu Chartier | ea0831f | 2015-12-29 13:17:37 -0800 | [diff] [blame] | 423 | void InternTable::Table::AddNewTable() { |
| 424 | tables_.push_back(UnorderedSet()); |
Mathieu Chartier | eb175f7 | 2014-10-31 11:49:27 -0700 | [diff] [blame] | 425 | } |
| 426 | |
| 427 | void InternTable::Table::Insert(mirror::String* s) { |
Mathieu Chartier | ea0831f | 2015-12-29 13:17:37 -0800 | [diff] [blame] | 428 | // Always insert the last table, the image tables are before and we avoid inserting into these |
| 429 | // to prevent dirty pages. |
| 430 | DCHECK(!tables_.empty()); |
| 431 | tables_.back().Insert(GcRoot<mirror::String>(s)); |
Mathieu Chartier | eb175f7 | 2014-10-31 11:49:27 -0700 | [diff] [blame] | 432 | } |
| 433 | |
Mathieu Chartier | bb87e0f | 2015-04-03 11:21:55 -0700 | [diff] [blame] | 434 | void InternTable::Table::VisitRoots(RootVisitor* visitor) { |
Mathieu Chartier | 4809d0a | 2015-04-07 10:39:04 -0700 | [diff] [blame] | 435 | BufferedRootVisitor<kDefaultBufferedRootCount> buffered_visitor( |
| 436 | visitor, RootInfo(kRootInternedString)); |
Mathieu Chartier | ea0831f | 2015-12-29 13:17:37 -0800 | [diff] [blame] | 437 | for (UnorderedSet& table : tables_) { |
| 438 | for (auto& intern : table) { |
| 439 | buffered_visitor.VisitRoot(intern); |
| 440 | } |
Mathieu Chartier | eb175f7 | 2014-10-31 11:49:27 -0700 | [diff] [blame] | 441 | } |
| 442 | } |
| 443 | |
Mathieu Chartier | 9750995 | 2015-07-13 14:35:43 -0700 | [diff] [blame] | 444 | void InternTable::Table::SweepWeaks(IsMarkedVisitor* visitor) { |
Mathieu Chartier | ea0831f | 2015-12-29 13:17:37 -0800 | [diff] [blame] | 445 | for (UnorderedSet& table : tables_) { |
| 446 | SweepWeaks(&table, visitor); |
| 447 | } |
Mathieu Chartier | eb175f7 | 2014-10-31 11:49:27 -0700 | [diff] [blame] | 448 | } |
| 449 | |
Mathieu Chartier | 9750995 | 2015-07-13 14:35:43 -0700 | [diff] [blame] | 450 | void InternTable::Table::SweepWeaks(UnorderedSet* set, IsMarkedVisitor* visitor) { |
Mathieu Chartier | eb175f7 | 2014-10-31 11:49:27 -0700 | [diff] [blame] | 451 | for (auto it = set->begin(), end = set->end(); it != end;) { |
| 452 | // This does not need a read barrier because this is called by GC. |
Mathieu Chartier | c2e2062 | 2014-11-03 11:41:47 -0800 | [diff] [blame] | 453 | mirror::Object* object = it->Read<kWithoutReadBarrier>(); |
Mathieu Chartier | 9750995 | 2015-07-13 14:35:43 -0700 | [diff] [blame] | 454 | mirror::Object* new_object = visitor->IsMarked(object); |
Mathieu Chartier | eb175f7 | 2014-10-31 11:49:27 -0700 | [diff] [blame] | 455 | if (new_object == nullptr) { |
Mathieu Chartier | c2e2062 | 2014-11-03 11:41:47 -0800 | [diff] [blame] | 456 | it = set->Erase(it); |
Mathieu Chartier | eb175f7 | 2014-10-31 11:49:27 -0700 | [diff] [blame] | 457 | } else { |
Mathieu Chartier | c2e2062 | 2014-11-03 11:41:47 -0800 | [diff] [blame] | 458 | *it = GcRoot<mirror::String>(new_object->AsString()); |
Mathieu Chartier | eb175f7 | 2014-10-31 11:49:27 -0700 | [diff] [blame] | 459 | ++it; |
| 460 | } |
| 461 | } |
| 462 | } |
| 463 | |
Mathieu Chartier | c2e2062 | 2014-11-03 11:41:47 -0800 | [diff] [blame] | 464 | size_t InternTable::Table::Size() const { |
Mathieu Chartier | ea0831f | 2015-12-29 13:17:37 -0800 | [diff] [blame] | 465 | return std::accumulate(tables_.begin(), |
| 466 | tables_.end(), |
Mathieu Chartier | 205b762 | 2016-01-06 15:47:09 -0800 | [diff] [blame] | 467 | 0U, |
Mathieu Chartier | ea0831f | 2015-12-29 13:17:37 -0800 | [diff] [blame] | 468 | [](size_t sum, const UnorderedSet& set) { |
| 469 | return sum + set.Size(); |
| 470 | }); |
Mathieu Chartier | c2e2062 | 2014-11-03 11:41:47 -0800 | [diff] [blame] | 471 | } |
| 472 | |
Mathieu Chartier | 14c3bf9 | 2015-07-13 14:35:43 -0700 | [diff] [blame] | 473 | void InternTable::ChangeWeakRootState(gc::WeakRootState new_state) { |
| 474 | MutexLock mu(Thread::Current(), *Locks::intern_table_lock_); |
| 475 | ChangeWeakRootStateLocked(new_state); |
| 476 | } |
| 477 | |
| 478 | void InternTable::ChangeWeakRootStateLocked(gc::WeakRootState new_state) { |
Hiroshi Yamauchi | fdbd13c | 2015-09-02 16:16:58 -0700 | [diff] [blame] | 479 | CHECK(!kUseReadBarrier); |
Mathieu Chartier | 14c3bf9 | 2015-07-13 14:35:43 -0700 | [diff] [blame] | 480 | weak_root_state_ = new_state; |
| 481 | if (new_state != gc::kWeakRootStateNoReadsOrWrites) { |
| 482 | weak_intern_condition_.Broadcast(Thread::Current()); |
| 483 | } |
| 484 | } |
| 485 | |
Mathieu Chartier | 32cc9ee | 2015-10-15 09:19:15 -0700 | [diff] [blame] | 486 | InternTable::Table::Table() { |
| 487 | Runtime* const runtime = Runtime::Current(); |
Mathieu Chartier | ea0831f | 2015-12-29 13:17:37 -0800 | [diff] [blame] | 488 | // Initial table. |
| 489 | tables_.push_back(UnorderedSet()); |
| 490 | tables_.back().SetLoadFactor(runtime->GetHashTableMinLoadFactor(), |
| 491 | runtime->GetHashTableMaxLoadFactor()); |
Mathieu Chartier | 32cc9ee | 2015-10-15 09:19:15 -0700 | [diff] [blame] | 492 | } |
| 493 | |
Brian Carlstrom | 7e93b50 | 2011-08-04 14:16:22 -0700 | [diff] [blame] | 494 | } // namespace art |