Yet more timing logger cleanup
Some cleanup of timing logger placement, additional systrace placement for
threaded compilation work, tweaking/hiding of some type names per previous
review comments.
Change-Id: Ic7db2e02747282ac7f474b9a060df9803bfdfa5e
diff --git a/compiler/driver/compiler_driver.cc b/compiler/driver/compiler_driver.cc
index ae00100..144271d 100644
--- a/compiler/driver/compiler_driver.cc
+++ b/compiler/driver/compiler_driver.cc
@@ -16,8 +16,10 @@
#include "compiler_driver.h"
-#include <vector>
+#define ATRACE_TAG ATRACE_TAG_DALVIK
+#include <utils/Trace.h>
+#include <vector>
#include <unistd.h>
#include "base/stl_util.h"
@@ -1562,14 +1564,14 @@
static void VerifyClass(const ParallelCompilationManager* manager, size_t class_def_index)
LOCKS_EXCLUDED(Locks::mutator_lock_) {
+ ATRACE_CALL();
ScopedObjectAccess soa(Thread::Current());
const DexFile::ClassDef& class_def = manager->GetDexFile()->GetClassDef(class_def_index);
const char* descriptor = manager->GetDexFile()->GetClassDescriptor(class_def);
mirror::Class* klass =
manager->GetClassLinker()->FindClass(descriptor,
soa.Decode<mirror::ClassLoader*>(manager->GetClassLoader()));
- if (klass == NULL) {
- CHECK(soa.Self()->IsExceptionPending());
+ if (klass == NULL) { CHECK(soa.Self()->IsExceptionPending());
soa.Self()->ClearException();
/*
@@ -1600,6 +1602,7 @@
soa.Self()->ClearException();
}
+
CHECK(klass->IsCompileTimeVerified() || klass->IsErroneous())
<< PrettyDescriptor(klass) << ": state=" << klass->GetStatus();
soa.Self()->AssertNoPendingException();
@@ -2135,6 +2138,7 @@
}
void CompilerDriver::CompileClass(const ParallelCompilationManager* manager, size_t class_def_index) {
+ ATRACE_CALL();
jobject jclass_loader = manager->GetClassLoader();
const DexFile& dex_file = *manager->GetDexFile();
const DexFile::ClassDef& class_def = dex_file.GetClassDef(class_def_index);
@@ -2155,6 +2159,7 @@
// empty class, probably a marker interface
return;
}
+
// Can we run DEX-to-DEX compiler on this class ?
DexToDexCompilationLevel dex_to_dex_compilation_level = kDontDexToDexCompile;
{