summaryrefslogtreecommitdiffstats
path: root/vm/Init.c
diff options
context:
space:
mode:
authorCarl Shapiro <cshapiro@google.com>2011-02-01 11:32:44 -0800
committerCarl Shapiro <cshapiro@google.com>2011-02-01 11:32:44 -0800
commit01605d2b668e8e1701cfdfa302dde847b9171fc9 (patch)
tree0e4191085609463310771764c2e877c9499b5080 /vm/Init.c
parent83d17b3741cfa07176f8559b6585fe9a61a27091 (diff)
downloadandroid_dalvik-01605d2b668e8e1701cfdfa302dde847b9171fc9.tar.gz
android_dalvik-01605d2b668e8e1701cfdfa302dde847b9171fc9.tar.bz2
android_dalvik-01605d2b668e8e1701cfdfa302dde847b9171fc9.zip
Remove the unused monitor tracking and deadlock prediction code.
This feature has been in the code base for several releases but has never been enabled. Change-Id: Ia770b03ebc90a3dc7851c0cd8ef301f9762f50db
Diffstat (limited to 'vm/Init.c')
-rw-r--r--vm/Init.c24
1 files changed, 0 insertions, 24 deletions
diff --git a/vm/Init.c b/vm/Init.c
index c2c0d5eda..2b590bc52 100644
--- a/vm/Init.c
+++ b/vm/Init.c
@@ -142,12 +142,6 @@ static void usage(const char* progName)
" debugger"
" profiler"
" hprof"
-#ifdef WITH_MONITOR_TRACKING
- " monitor_tracking"
-#endif
-#ifdef WITH_DEADLOCK_PREDICTION
- " deadlock_prediction"
-#endif
#ifdef WITH_TRACKREF_CHECKS
" trackref_checks"
#endif
@@ -965,24 +959,6 @@ static int processOptions(int argc, const char* const argv[],
}
#endif
- } else if (strncmp(argv[i], "-Xdeadlockpredict:", 18) == 0) {
-#ifdef WITH_DEADLOCK_PREDICTION
- if (strcmp(argv[i] + 18, "off") == 0)
- gDvm.deadlockPredictMode = kDPOff;
- else if (strcmp(argv[i] + 18, "warn") == 0)
- gDvm.deadlockPredictMode = kDPWarn;
- else if (strcmp(argv[i] + 18, "err") == 0)
- gDvm.deadlockPredictMode = kDPErr;
- else if (strcmp(argv[i] + 18, "abort") == 0)
- gDvm.deadlockPredictMode = kDPAbort;
- else {
- dvmFprintf(stderr, "Bad value for -Xdeadlockpredict");
- return -1;
- }
- if (gDvm.deadlockPredictMode != kDPOff)
- LOGD("Deadlock prediction enabled (%s)\n", argv[i]+18);
-#endif
-
} else if (strncmp(argv[i], "-Xstacktracefile:", 17) == 0) {
gDvm.stackTraceFile = strdup(argv[i]+17);