Document all logging tags.
Also a few formatting fixes.
Test: adb shell dalvikvm -h
Change-Id: If12613f0af14c12ea3b2f55462587c342cbd337b
diff --git a/runtime/parsed_options.cc b/runtime/parsed_options.cc
index 3e0c52b..a5e9d95 100644
--- a/runtime/parsed_options.cc
+++ b/runtime/parsed_options.cc
@@ -684,15 +684,19 @@
UsageMessage(stream, "The following standard options are supported:\n");
UsageMessage(stream, " -classpath classpath (-cp classpath)\n");
UsageMessage(stream, " -Dproperty=value\n");
- UsageMessage(stream, " -verbose:tag ('gc', 'jit', 'jni', or 'class')\n");
+ UsageMessage(stream, " -verbose:tag[,tag...] (currently valid tags: 'agents', 'class',\n"
+ " 'collector', 'compiler', 'deopt', 'dex', 'gc', 'heap', 'image',\n"
+ " 'interpreter', 'jdwp', 'jit', 'jni', 'monitor', 'oat', 'profiler',\n"
+ " 'signals', 'simulator', 'startup', 'systrace-locks',\n"
+ " 'third-party-jni', 'threads', 'verifier', 'verifier-debug')\n");
UsageMessage(stream, " -showversion\n");
UsageMessage(stream, " -help\n");
UsageMessage(stream, " -agentlib:jdwp=options\n");
// TODO add back in once -agentlib actually does something.
// UsageMessage(stream, " -agentlib:library=options (Experimental feature, "
// "requires -Xexperimental:agent, some features might not be supported)\n");
- UsageMessage(stream, " -agentpath:library_path=options (Experimental feature, "
- "requires -Xexperimental:agent, some features might not be supported)\n");
+ UsageMessage(stream, " -agentpath:library_path=options (Experimental feature, requires\n"
+ " -Xexperimental:agent, some features might not be supported)\n");
UsageMessage(stream, "\n");
UsageMessage(stream, "The following extended options are supported:\n");
@@ -750,7 +754,7 @@
UsageMessage(stream, " -XX:MadviseRandomAccess:booleanvalue\n");
UsageMessage(stream, " -XX:SlowDebug={false,true}\n");
UsageMessage(stream, " -Xmethod-trace\n");
- UsageMessage(stream, " -Xmethod-trace-file:filename");
+ UsageMessage(stream, " -Xmethod-trace-file:filename\n");
UsageMessage(stream, " -Xmethod-trace-file-size:integervalue\n");
UsageMessage(stream, " -Xps-min-save-period-ms:integervalue\n");
UsageMessage(stream, " -Xps-save-resolved-classes-delay-ms:integervalue\n");