Add profiler type options

This is related to the CL that adds a new type of profile data.

Change-Id: I3e4e502da8e1b0dd9b32ddcbc5d11eca0d1ba2e5

1 files changed, 16 insertions, 0 deletions

diff --git a/core/jni/AndroidRuntime.cpp b/core/jni/AndroidRuntime.cpp
index a61901b62c72..253dcea62ca5 100644
--- a/core/jni/AndroidRuntime.cpp
+++ b/core/jni/AndroidRuntime.cpp
@@ -490,6 +490,8 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv)
     char profile_backoff[sizeof("-Xprofile-backoff:") + PROPERTY_VALUE_MAX];
     char profile_top_k_threshold[sizeof("-Xprofile-top-k-threshold:") + PROPERTY_VALUE_MAX];
     char profile_top_k_change_threshold[sizeof("-Xprofile-top-k-change-threshold:") + PROPERTY_VALUE_MAX];
+    char profile_type[sizeof("-Xprofile-type:") + PROPERTY_VALUE_MAX];
+    char profile_max_stack_depth[sizeof("-Xprofile-max-stack-depth:")+PROPERTY_VALUE_MAX];
     char langOption[sizeof("-Duser.language=") + 3];
     char regionOption[sizeof("-Duser.region=") + 3];
     char lockProfThresholdBuf[sizeof("-Xlockprofthreshold:") + sizeof(propBuf)];
@@ -872,6 +874,20 @@ int AndroidRuntime::startVm(JavaVM** pJavaVM, JNIEnv** pEnv)
             opt.optionString = profile_top_k_change_threshold;
             mOptions.add(opt);
         }
+
+        // Type of profile data.
+        strcpy(profile_type, "-Xprofile-type:");
+        if (property_get("dalvik.vm.profiler.type", profile_type+15, NULL) > 0) {
+            opt.optionString = profile_type;
+            mOptions.add(opt);
+        }
+
+        // Depth of bounded stack data
+        strcpy(profile_max_stack_depth, "-Xprofile-max-stack-depth:");
+        if (property_get("dalvik.vm.profile.max-stack-depth", profile_max_stack_depth+26, NULL) > 0) {
+           opt.optionString = profile_max_stack_depth;
+           mOptions.add(opt);
+        }
     }
 
     initArgs.version = JNI_VERSION_1_4;