Change IsMethodTracingActive to GetMethodTracingMode for art.
This allows traceview to tell whether sampling or just normal
method profiling is enabled.
Change-Id: I518a1888a90bc50568fe56bf708d801027ac98d7
diff --git a/runtime/trace.cc b/runtime/trace.cc
index 6d040e1..7b25306 100644
--- a/runtime/trace.cc
+++ b/runtime/trace.cc
@@ -427,14 +427,20 @@
}
void Trace::Shutdown() {
- if (IsMethodTracingActive()) {
+ if (GetMethodTracingMode() != kTracingInactive) {
Stop();
}
}
-bool Trace::IsMethodTracingActive() {
+TracingMode Trace::GetMethodTracingMode() {
MutexLock mu(Thread::Current(), *Locks::trace_lock_);
- return the_trace_ != NULL;
+ if (the_trace_ == NULL) {
+ return kTracingInactive;
+ } else if (the_trace_->sampling_enabled_) {
+ return kSampleProfilingActive;
+ } else {
+ return kMethodTracingActive;
+ }
}
Trace::Trace(File* trace_file, int buffer_size, int flags, bool sampling_enabled)