commit 64caa7dcf46ed6139b766dbe77fbd7353899417f
author Jeff Hao <jeffhao@google.com> Thu Aug 29 11:18:01 2013 -0700
committer Jeff Hao <jeffhao@google.com> Thu Aug 29 16:14:56 2013 -0700
tree 9606418421c5cda2116e343ae5988f98fc4fd03a
parent afbe1622c02379fb7f7835d73a5594b40d31d3ea

Change IsMethodTracingActive to GetMethodTracingMode for art.

This allows traceview to tell whether sampling or just normal
method profiling is enabled.

Change-Id: I518a1888a90bc50568fe56bf708d801027ac98d7

runtime/trace.h

diff --git a/runtime/trace.h b/runtime/trace.h
index 06cb6a6..ffcb36d 100644
--- a/runtime/trace.h
+++ b/runtime/trace.h
@@ -42,6 +42,12 @@
   kProfilerClockSourceDual,  // Both wall and thread CPU clocks.
 };
 
+enum TracingMode {
+  kTracingInactive,
+  kMethodTracingActive,
+  kSampleProfilingActive,
+};
+
 class Trace : public instrumentation::InstrumentationListener {
  public:
   enum TraceFlag {
@@ -58,7 +64,7 @@
                  Locks::trace_lock_);
   static void Stop() LOCKS_EXCLUDED(Locks::trace_lock_);
   static void Shutdown() LOCKS_EXCLUDED(Locks::trace_lock_);
-  static bool IsMethodTracingActive() LOCKS_EXCLUDED(Locks::trace_lock_);
+  static TracingMode GetMethodTracingMode() LOCKS_EXCLUDED(Locks::trace_lock_);
 
   bool UseWallClock();
   bool UseThreadCpuClock();