Changeset 200092 in webkit for trunk/Source/JavaScriptCore/jsc.cpp

Timestamp:

Apr 26, 2016, 9:47:33 AM (9 years ago)

Author:

[email protected]

Message:

Improve jsc --help and making sampling options
​https://bugs.webkit.org/show_bug.cgi?id=157015

Patch by Joseph Pecoraro <Joseph Pecoraro> on 2016-04-26
Reviewed by Saam Barati.

Simplify sampling options to be easier to remember:

• --reportSamplingProfilerData => --sample
• --samplingProfilerTimingInterval => --sampleInterval

Update the --help to mention --sample, and restore the behavior of
--options outputing all possible options so you can discover which
options are available.

• jsc.cpp:

(printUsageStatement):
(CommandLine::parseArguments):
Improve help and modify option dumping.

• runtime/Options.h:
• runtime/SamplingProfiler.cpp:

(JSC::SamplingProfiler::SamplingProfiler):
Rename the sampling interval option.

File:

• trunk/Source/JavaScriptCore/jsc.cpp (modified) (4 diffs)

trunk/Source/JavaScriptCore/jsc.cpp

@@ -2101 +2101 @@
     fprintf(stderr, "  -x         Output exit code before terminating\n");
     fprintf(stderr, "\n");
+    fprintf(stderr, "  --sample                   Collects and outputs sampling profiler data\n");
     fprintf(stderr, "  --options                  Dumps all JSC VM options and exits\n");
-    fprintf(stderr, "  --dumpOptions              Dumps all JSC VM options before continuing\n");
+    fprintf(stderr, "  --dumpOptions              Dumps all non-default JSC VM options before continuing\n");
     fprintf(stderr, "  --<jsc VM option>=<value>  Sets the specified JSC VM option\n");
     fprintf(stderr, "\n");
@@ -2114 +2115 @@
     
     int i = 1;
-    bool needToDumpOptions = false;
+    JSC::Options::DumpLevel dumpOptionsLevel = JSC::Options::DumpLevel::None;
     bool needToExit = false;
 
@@ -2172 +2173 @@
 
         if (!strcmp(arg, "--options")) {
-            needToDumpOptions = true;
+            dumpOptionsLevel = JSC::Options::DumpLevel::Verbose;
             needToExit = true;
             continue;
         }
         if (!strcmp(arg, "--dumpOptions")) {
-            needToDumpOptions = true;
+            dumpOptionsLevel = JSC::Options::DumpLevel::Overridden;
             continue;
         }
-        if (!strcmp(arg, "--reportSamplingProfilerData")) {
+        if (!strcmp(arg, "--sample")) {
             JSC::Options::useSamplingProfiler() = true;
             JSC::Options::collectSamplingProfilerDataForJSCShell() = true;
@@ -2210 +2211 @@
         m_arguments.append(argv[i]);
 
-    if (needToDumpOptions)
-        JSC::Options::dumpAllOptions(stderr, JSC::Options::DumpLevel::Overridden, "All JSC runtime options:");
+    if (dumpOptionsLevel != JSC::Options::DumpLevel::None)
+        JSC::Options::dumpAllOptions(stderr, dumpOptionsLevel, "All JSC runtime options:");
     JSC::Options::ensureOptionsAreCoherent();
     if (needToExit)