commit f6174e8a1566bb357e82506f7ec97dc359c90eb2
author jeffhao <jeffhao@google.com> Tue Jan 31 16:14:17 2012 -0800
committer jeffhao <jeffhao@google.com> Tue Jan 31 17:48:30 2012 -0800
tree b74b1fc81d0dc0b2f2da7ab6f5187493f15a0b66
parent 4d9716c19cc25911e639272048abd0d6702bb082

Fix to prevent a dex file from being verified multiple times.

Instead of verifying a dex file whenever one is initialized, they're now
verified when not opened from memory. Also, the way dalvik_system_DexFile
opens dex files has been changed to check for an existing oat file and
get the corresponding dex file from there instead.

Change-Id: I75fc26247150107d628e2c4e364ef8a53fbf9481

src/dex_file.cc

diff --git a/src/dex_file.cc b/src/dex_file.cc
index 14413e8..974f6e5 100644
--- a/src/dex_file.cc
+++ b/src/dex_file.cc
@@ -134,7 +134,11 @@
     return NULL;
   }
   close(fd);
-  return OpenMemory(location, map.release());
+  const DexFile* dex_file = OpenMemory(location, map.release());
+  if (dex_file != NULL) {
+    DexFileVerifier::Verify(dex_file, dex_file->Begin(), dex_file->Size());
+  }
+  return dex_file;
 }
 
 const char* DexFile::kClassesDex = "classes.dex";
@@ -178,15 +182,19 @@
     return NULL;
   }
 
-  return OpenMemory(location, map.release());
+  const DexFile* dex_file = OpenMemory(location, map.release());
+  if (dex_file != NULL) {
+    DexFileVerifier::Verify(dex_file, dex_file->Begin(), dex_file->Size());
+  }
+  return dex_file;
 }
 
 const DexFile* DexFile::OpenMemory(const byte* base,
-                                   size_t length,
+                                   size_t size,
                                    const std::string& location,
                                    MemMap* mem_map) {
   CHECK_ALIGNED(base, 4); // various dex file structures must be word aligned
-  UniquePtr<DexFile> dex_file(new DexFile(base, length, location, mem_map));
+  UniquePtr<DexFile> dex_file(new DexFile(base, size, location, mem_map));
   if (!dex_file->Init()) {
     return NULL;
   } else {
@@ -208,7 +216,7 @@
   }
 
   void* address = const_cast<void*>(reinterpret_cast<const void*>(begin_));
-  jobject byte_buffer = env->NewDirectByteBuffer(address, length_);
+  jobject byte_buffer = env->NewDirectByteBuffer(address, size_);
   if (byte_buffer == NULL) {
     return NULL;
   }
@@ -240,9 +248,6 @@
     return false;
   }
   InitIndex();
-  if (!DexFileVerifier::Verify(this, begin_, length_)) {
-    return false;
-  }
   return true;
 }
 
@@ -256,7 +261,7 @@
   method_ids_ = reinterpret_cast<const MethodId*>(b + h->method_ids_off_);
   proto_ids_ = reinterpret_cast<const ProtoId*>(b + h->proto_ids_off_);
   class_defs_ = reinterpret_cast<const ClassDef*>(b + h->class_defs_off_);
-  DCHECK_EQ(length_, header_->file_size_);
+  DCHECK_EQ(size_, header_->file_size_);
 }
 
 bool DexFile::CheckMagicAndVersion() const {