commit e343b76af81a005ef64f5e75a555389fd9147dab
author jeffhao <jeffhao@google.com> Mon Dec 05 16:36:44 2011 -0800
committer jeffhao <jeffhao@google.com> Wed Dec 07 16:34:28 2011 -0800
tree f6ec517c56338244d06723c49d610b5d948c3fa7
parent 5b245f344cbe8402cfe35c3a42988081e71208bc

Stub to capture method entry/exit.

Added stubs to allow traceview to do method tracing. Currently only
outputs to logcat, and a later change will generate the proper log file.

Change-Id: Icaafc50e2eaf042ddc4d882011f7e8121bdd8b1c

src/dalvik_system_VMDebug.cc

diff --git a/src/dalvik_system_VMDebug.cc b/src/dalvik_system_VMDebug.cc
index 65126e7..c4c43f1 100644
--- a/src/dalvik_system_VMDebug.cc
+++ b/src/dalvik_system_VMDebug.cc
@@ -17,6 +17,7 @@
 #include "class_linker.h"
 #include "debugger.h"
 #include "jni_internal.h"
+#include "trace.h"
 #include "hprof/hprof.h"
 #include "ScopedUtfChars.h"
 #include "toStringArray.h"
@@ -36,9 +37,8 @@
  */
 jobjectArray VMDebug_getVmFeatureList(JNIEnv* env, jclass) {
   std::vector<std::string> features;
-  // TODO: we might need to uncomment these to make them work.
-  //features.push_back("method-trace-profiling");
-  //features.push_back("method-trace-profiling-streaming");
+  features.push_back("method-trace-profiling");
+  features.push_back("method-trace-profiling-streaming");
   features.push_back("hprof-heap-dump");
   features.push_back("hprof-heap-dump-streaming");
   return toStringArray(env, features);
@@ -61,8 +61,7 @@
 }
 
 void VMDebug_startMethodTracingDdmsImpl(JNIEnv* env, jclass, jint bufferSize, jint flags) {
-  UNIMPLEMENTED(WARNING);
-  //dvmMethodTraceStart("[DDMS]", -1, bufferSize, flags, true);
+  Trace::Start("[DDMS]", -1, bufferSize, flags, true);
 }
 
 void VMDebug_startMethodTracingFd(JNIEnv* env, jclass, jstring javaTraceFilename, jobject javaFd, jint bufferSize, jint flags) {
@@ -81,8 +80,7 @@
   if (traceFilename.c_str() == NULL) {
     return;
   }
-  UNIMPLEMENTED(WARNING);
-  //dvmMethodTraceStart(traceFilename.c_str(), fd, bufferSize, flags, false);
+  Trace::Start(traceFilename.c_str(), fd, bufferSize, flags, false);
 }
 
 void VMDebug_startMethodTracingFilename(JNIEnv* env, jclass, jstring javaTraceFilename, jint bufferSize, jint flags) {
@@ -90,18 +88,15 @@
   if (traceFilename.c_str() == NULL) {
     return;
   }
-  UNIMPLEMENTED(WARNING);
-  //dvmMethodTraceStart(traceFilename.c_str(), -1, bufferSize, flags, false);
+  Trace::Start(traceFilename.c_str(), -1, bufferSize, flags, false);
 }
 
 jboolean VMDebug_isMethodTracingActive(JNIEnv*, jclass) {
-  UNIMPLEMENTED(WARNING);
-  return JNI_FALSE; //dvmIsMethodTraceActive();
+  return Trace::IsMethodTracingActive();
 }
 
 void VMDebug_stopMethodTracing(JNIEnv*, jclass) {
-  UNIMPLEMENTED(WARNING);
-  //dvmMethodTraceStop();
+  Trace::Stop();
 }
 
 void VMDebug_startEmulatorTracing(JNIEnv*, jclass) {