OSDN Git Service
(root)
/
android-x86
/
dalvik.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change IsMethodTracingActive to GetMethodTracingMode.
[android-x86/dalvik.git]
/
vm
/
native
/
dalvik_system_VMDebug.cpp
diff --git
a/vm/native/dalvik_system_VMDebug.cpp
b/vm/native/dalvik_system_VMDebug.cpp
index
8ba304a
..
5377357
100644
(file)
--- 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 isMethodTracingActiv
e()
+ * static
int getMethodTracingMod
e()
*
*
- * 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_
isMethodTracingActiv
e(const u4* args,
+static void Dalvik_dalvik_system_VMDebug_
getMethodTracingMod
e(const u4* args,
JValue* pResult)
{
UNUSED_PARAMETER(args);
JValue* pResult)
{
UNUSED_PARAMETER(args);
- RETURN_
BOOLEAN(dvmIsMethodTraceActiv
e());
+ RETURN_
INT(dvmGetMethodTracingMod
e());
}
/*
}
/*
@@
-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 },
Dalvik_dalvik_system_VMDebug_startMethodTracingFd },
{ "startMethodTracingFilename", "(Ljava/lang/String;II)V",
Dalvik_dalvik_system_VMDebug_startMethodTracingFilename },
- { "
isMethodTracingActive", "()Z
",
- Dalvik_dalvik_system_VMDebug_
isMethodTracingActiv
e },
+ { "
getMethodTracingMode", "()I
",
+ Dalvik_dalvik_system_VMDebug_
getMethodTracingMod
e },
{ "stopMethodTracing", "()V",
Dalvik_dalvik_system_VMDebug_stopMethodTracing },
{ "startEmulatorTracing", "()V",
{ "stopMethodTracing", "()V",
Dalvik_dalvik_system_VMDebug_stopMethodTracing },
{ "startEmulatorTracing", "()V",