diff options
| author | Jeff Hao <jeffhao@google.com> | 2013-08-29 14:04:34 -0700 |
|---|---|---|
| committer | Jeff Hao <jeffhao@google.com> | 2013-08-30 18:02:06 +0000 |
| commit | 07344a400805d3d267352bf2694e728b29aa8ea8 (patch) | |
| tree | 065786a773ec96767d26cdf9c76ea155e5e2a8b7 /vm/native/dalvik_system_VMDebug.cpp | |
| parent | 8dd134b6a68f79c5369b6015a543eb7c0f5e649e (diff) | |
| download | android_dalvik-07344a400805d3d267352bf2694e728b29aa8ea8.tar.gz android_dalvik-07344a400805d3d267352bf2694e728b29aa8ea8.tar.bz2 android_dalvik-07344a400805d3d267352bf2694e728b29aa8ea8.zip | |
Change IsMethodTracingActive to GetMethodTracingMode.
This allows traceview to tell whether tracing is active, and whether
it is sampling or method tracing.
Bug: 9968521
Change-Id: I72100d1536ea3168998110ec1cfa5a183b55a67c
(cherry picked from commit 9d3a0a2e253aecd07c4a053c19cf9b0ccaa2db49)
Diffstat (limited to 'vm/native/dalvik_system_VMDebug.cpp')
| -rw-r--r-- | vm/native/dalvik_system_VMDebug.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/vm/native/dalvik_system_VMDebug.cpp b/vm/native/dalvik_system_VMDebug.cpp index 8ba304a6e..53773575f 100644 --- a/vm/native/dalvik_system_VMDebug.cpp +++ b/vm/native/dalvik_system_VMDebug.cpp @@ -301,16 +301,16 @@ static void Dalvik_dalvik_system_VMDebug_startMethodTracingFilename(const u4* ar } /* - * static boolean isMethodTracingActive() + * static int getMethodTracingMode() * - * Determine whether method tracing is currently active. + * Determine whether method tracing is currently active and what type is active. */ -static void Dalvik_dalvik_system_VMDebug_isMethodTracingActive(const u4* args, +static void Dalvik_dalvik_system_VMDebug_getMethodTracingMode(const u4* args, JValue* pResult) { UNUSED_PARAMETER(args); - RETURN_BOOLEAN(dvmIsMethodTraceActive()); + RETURN_INT(dvmGetMethodTracingMode()); } /* @@ -827,8 +827,8 @@ const DalvikNativeMethod dvm_dalvik_system_VMDebug[] = { Dalvik_dalvik_system_VMDebug_startMethodTracingFd }, { "startMethodTracingFilename", "(Ljava/lang/String;II)V", Dalvik_dalvik_system_VMDebug_startMethodTracingFilename }, - { "isMethodTracingActive", "()Z", - Dalvik_dalvik_system_VMDebug_isMethodTracingActive }, + { "getMethodTracingMode", "()I", + Dalvik_dalvik_system_VMDebug_getMethodTracingMode }, { "stopMethodTracing", "()V", Dalvik_dalvik_system_VMDebug_stopMethodTracing }, { "startEmulatorTracing", "()V", |