diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2015-02-24 09:37:21 -0800 |
|---|---|---|
| committer | Mathieu Chartier <mathieuc@google.com> | 2015-02-24 10:47:02 -0800 |
| commit | e5f13e57ff8fa36342beb33830b3ec5942a61cca (patch) | |
| tree | 02e370ecc4e0d955f28bfc71a41015f94fbb19b7 /runtime/trace.cc | |
| parent | 354d58ba776866ea7b1c71f0d0848d5aaa013ae3 (diff) | |
| download | art-e5f13e57ff8fa36342beb33830b3ec5942a61cca.tar.gz art-e5f13e57ff8fa36342beb33830b3ec5942a61cca.tar.bz2 art-e5f13e57ff8fa36342beb33830b3ec5942a61cca.zip | |
Revert "Revert "Add JIT""
Added missing EntryPointToCodePointer.
This reverts commit a5ca888d715cd0c6c421313211caa1928be3e399.
Change-Id: Ia74df0ef3a7babbdcb0466fd24da28e304e3f5af
Diffstat (limited to 'runtime/trace.cc')
| -rw-r--r-- | runtime/trace.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/runtime/trace.cc b/runtime/trace.cc index 0950abeb97..93b3877bf4 100644 --- a/runtime/trace.cc +++ b/runtime/trace.cc @@ -298,7 +298,7 @@ void* Trace::RunSamplingThread(void* arg) { intptr_t interval_us = reinterpret_cast<intptr_t>(arg); CHECK_GE(interval_us, 0); CHECK(runtime->AttachCurrentThread("Sampling Profiler", true, runtime->GetSystemThreadGroup(), - !runtime->IsCompiler())); + !runtime->IsAotCompiler())); while (true) { usleep(interval_us); @@ -627,6 +627,12 @@ void Trace::ExceptionCaught(Thread* thread, const ThrowLocation& throw_location, LOG(ERROR) << "Unexpected exception caught event in tracing"; } +void Trace::BackwardBranch(Thread* /*thread*/, mirror::ArtMethod* method, + int32_t /*dex_pc_offset*/) + SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) { + LOG(ERROR) << "Unexpected backward branch event in tracing" << PrettyMethod(method); +} + void Trace::ReadClocks(Thread* thread, uint32_t* thread_clock_diff, uint32_t* wall_clock_diff) { if (UseThreadCpuClock()) { uint64_t clock_base = thread->GetTraceClockBase(); |