Interpreter entries and instrumentation as a listener.
Make the instrumentation responsible for whether we want method entry/exit
stubs, and allow it to use interpreter entry stubs when instruction by
instruction instrumentation is required. Improve deoptimization so more JDWP
test cases are passing.
Refactor exception debug posting, in particular improve reporting in the
interpreter. Improve class linker exception throwing so that broken dex files
are more likely to be reported. Fixes the performance issue Bug: 8410519.
Fix some error reporting lock level errors for the large object space. Make
fast object verification faster.
Add some debug mode robustness to finding dex PCs in GC maps.
Add printf attributes to JniAbortF and fix errors.
Expand run-test 044 to test return behaviors and fix issues with not throwing
appropriate exceptions for proxies.
Ensure causes are reported with a class linker NoClassDefFoundError and JNI
NoSuchFieldError.
Remove unused debugMe and updateDebuggerFromCode.
There's a minor sizing tweak to the arg array builder, and an extra reference
array check in the interpreter.
Some clean-up of trace code.
Fix reg type cache destructor if it is called after the reg type cache is
shutdown (as is the case in oatdump).
Change-Id: I6519c7b35df77f978d011999354c864f4918e8ce
diff --git a/src/runtime.h b/src/runtime.h
index f8788ad..67c8e36 100644
--- a/src/runtime.h
+++ b/src/runtime.h
@@ -30,6 +30,7 @@
#include "globals.h"
#include "heap.h"
#include "instruction_set.h"
+#include "instrumentation.h"
#include "jobject_comparator.h"
#include "locks.h"
#include "root_visitor.h"
@@ -49,7 +50,6 @@
class ClassLinker;
class DexFile;
class Heap;
-class Instrumentation;
class InternTable;
struct JavaVMExt;
class MonitorList;
@@ -112,10 +112,6 @@
return is_zygote_;
}
- bool InterpreterOnly() const {
- return interpreter_only_;
- }
-
bool IsConcurrentGcEnabled() const {
return is_concurrent_gc_enabled_;
}
@@ -234,8 +230,7 @@
void DirtyRoots();
// Visit all the roots.
- void VisitRoots(RootVisitor* visitor, void* arg)
- SHARED_LOCKS_REQUIRED(Locks::mutator_lock_);
+ void VisitRoots(RootVisitor* visitor, void* arg) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_);
// Visit all of the roots we can do safely do concurrently.
void VisitConcurrentRoots(RootVisitor* visitor, void* arg);
@@ -350,10 +345,9 @@
bool InitZygote();
void DidForkFromZygote();
- void EnableMethodTracing(Trace* trace);
- void DisableMethodTracing();
- bool IsMethodTracingActive() const;
- Instrumentation* GetInstrumentation() const;
+ instrumentation::Instrumentation* GetInstrumentation() {
+ return &instrumentation_;
+ }
bool UseCompileTimeClassPath() const {
return use_compile_time_class_path_;
@@ -383,7 +377,6 @@
bool is_compiler_;
bool is_zygote_;
- bool interpreter_only_;
bool is_concurrent_gc_enabled_;
// The host prefix is used during cross compilation. It is removed
@@ -466,7 +459,7 @@
bool method_trace_;
std::string method_trace_file_;
size_t method_trace_file_size_;
- Instrumentation* instrumentation_;
+ instrumentation::Instrumentation instrumentation_;
typedef SafeMap<jobject, std::vector<const DexFile*>, JobjectComparator> CompileTimeClassPaths;
CompileTimeClassPaths compile_time_class_paths_;