commit d1f1bf03e30320e5730790678f470ac8a610b6b6
author Ian Rogers <irogers@google.com> Sun Feb 26 16:59:20 2012 -0800
committer Ian Rogers <irogers@google.com> Mon Feb 27 11:27:55 2012 -0800
tree 156f80d15cae5afb2553c14ed086f6993cf1f5e4
parent d06b96119717ca5a43e51a9a1b767288252ea6af

Eagerly resolve strings that are in the image into dex caches

Previously part of Change Ieae1b74c

Change-Id: I15a57a3005d05b01ac60622031de88e9aa6dc33b

src/image_writer.cc

diff --git a/src/image_writer.cc b/src/image_writer.cc
index 91c4e3c..59d113d 100644
--- a/src/image_writer.cc
+++ b/src/image_writer.cc
@@ -73,6 +73,7 @@
 
   PruneNonImageClasses();  // Remove junk
   ComputeLazyFieldsForImageClasses();  // Add useful information
+  ComputeEagerResolvedStrings();
   Heap::CollectGarbage(false);  // Remove garbage
   Heap::GetAllocSpace()->Trim();  // Trim size of source_space
   if (!AllocMemory()) {
@@ -121,6 +122,35 @@
   return true;
 }
 
+void ImageWriter::ComputeEagerResolvedStringsCallback(Object* obj, void* arg) {
+  if (!obj->GetClass()->IsStringClass()) {
+    return;
+  }
+  String* string = obj->AsString();
+  std::string utf8_string(string->ToModifiedUtf8());
+  ImageWriter* writer = reinterpret_cast<ImageWriter*>(arg);
+  ClassLinker* linker = Runtime::Current()->GetClassLinker();
+  typedef Set::const_iterator CacheIt;  // TODO: C++0x auto
+  for (CacheIt it = writer->dex_caches_.begin(), end = writer->dex_caches_.end(); it != end; ++it) {
+    DexCache* dex_cache = *it;
+    const DexFile& dex_file = linker->FindDexFile(dex_cache);
+    const DexFile::StringId* string_id = dex_file.FindStringId(utf8_string);
+    if (string_id != NULL) {
+      // This string occurs in this dex file, assign the dex cache entry.
+      uint32_t string_idx = dex_file.GetIndexForStringId(*string_id);
+      if (dex_cache->GetResolvedString(string_idx) == NULL) {
+        dex_cache->SetResolvedString(string_idx, string);
+      }
+    }
+  }
+}
+
+void ImageWriter::ComputeEagerResolvedStrings() {
+  HeapBitmap* heap_bitmap = Heap::GetLiveBits();
+  DCHECK(heap_bitmap != NULL);
+  heap_bitmap->Walk(ComputeEagerResolvedStringsCallback, this);  // TODO: add Space-limited Walk
+}
+
 bool ImageWriter::IsImageClass(const Class* klass) {
   if (image_classes_ == NULL) {
     return true;

src/image_writer.h

diff --git a/src/image_writer.h b/src/image_writer.h
index 74a3f94..8db3570 100644
--- a/src/image_writer.h
+++ b/src/image_writer.h
@@ -110,6 +110,10 @@
   void ComputeLazyFieldsForImageClasses();
   static bool ComputeLazyFieldsForClassesVisitor(Class* klass, void* arg);
 
+  // Wire dex cache resolved strings to strings in the image to avoid runtime resolution
+  void ComputeEagerResolvedStrings();
+  static void ComputeEagerResolvedStringsCallback(Object* obj, void* arg);
+
   void PruneNonImageClasses();
   static bool NonImageClassesVisitor(Class* c, void* arg);