Bug 1521608 - Tweak MOZ_PROFILER_HELP log message. r=canaltinova
authorMarkus Stange <mstange@themasta.com>
Tue, 22 Jan 2019 11:35:46 +0000
changeset 514843 7c0ff7be5d8efeec8e8898769cd061fc9b16fb0b
parent 514842 681241586ba55ad09e9714f9939bbbfa1a9a1c41
child 514846 3ce0400d75993b11d6ec68239c5d3416ffe57997
push id1953
push userffxbld-merge
push dateMon, 11 Mar 2019 12:10:20 +0000
treeherdermozilla-release@9c35dcbaa899 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerscanaltinova
bugs1521608
milestone66.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1521608 - Tweak MOZ_PROFILER_HELP log message. r=canaltinova Differential Revision: https://phabricator.services.mozilla.com/D17160
tools/profiler/core/platform.cpp
--- a/tools/profiler/core/platform.cpp
+++ b/tools/profiler/core/platform.cpp
@@ -778,17 +778,17 @@ class ActivePS {
   // sNextGeneration is used to track the next generation number; it is static
   // because it must persist across different ActivePS instantiations.
   const uint32_t mGeneration;
   static uint32_t sNextGeneration;
 
   // The maximum number of entries in mBuffer.
   const uint32_t mCapacity;
 
-  // The maximum duration of entries in mBuffer.
+  // The maximum duration of entries in mBuffer, in seconds.
   const Maybe<double> mDuration;
 
   // The interval between samples, measured in milliseconds.
   const double mInterval;
 
   // The profile features that are enabled.
   const uint32_t mFeatures;
 
@@ -2073,21 +2073,22 @@ static void PrintUsageThenExit(int aExit
       "  Useful if you want profile code that runs very early.\n"
       "\n"
       "  MOZ_PROFILER_STARTUP_ENTRIES=<1..>\n"
       "  If MOZ_PROFILER_STARTUP is set, specifies the number of entries in\n"
       "  the profiler's circular buffer when the profiler is first started.\n"
       "  If unset, the platform default is used.\n"
       "\n"
       "  MOZ_PROFILER_STARTUP_DURATION=<1..>\n"
-      "  If MOZ_PROFILER_STARTUP is set, specifies the duration of entries in\n"
-      "  the profiler's circular buffer when the profiler is first started.\n"
-      "  If unset, duration of the entries will be restricted by.\n"
-      "  MOZ_PROFILER_STARTUP_ENTRIES or its default value instead of a time "
-      "duration."
+      "  If MOZ_PROFILER_STARTUP is set, specifies the maximum life time of\n"
+      "  entries in the the profiler's circular buffer when the profiler is\n"
+      "  first started, in seconds.\n"
+      "  If unset, the life time of the entries will only be restricted by\n"
+      "  MOZ_PROFILER_STARTUP_ENTRIES (or its default value), and no\n"
+      "  additional time duration restriction will be applied.\n"
       "\n"
       "  MOZ_PROFILER_STARTUP_INTERVAL=<1..1000>\n"
       "  If MOZ_PROFILER_STARTUP is set, specifies the sample interval,\n"
       "  measured in milliseconds, when the profiler is first started.\n"
       "  If unset, the platform default is used.\n"
       "\n"
       "  MOZ_PROFILER_STARTUP_FEATURES_BITFIELD=<Number>\n"
       "  If MOZ_PROFILER_STARTUP is set, specifies the profiling features, as\n"
@@ -2097,20 +2098,19 @@ static void PrintUsageThenExit(int aExit
       "  MOZ_PROFILER_STARTUP_FEATURES=<Features>\n"
       "  If MOZ_PROFILER_STARTUP is set, specifies the profiling features, as\n"
       "  a comma-separated list of strings.\n"
       "  Ignored if  MOZ_PROFILER_STARTUP_FEATURES_BITFIELD is set.\n"
       "  If unset, the platform default is used.\n"
       "\n"
       "  MOZ_PROFILER_STARTUP_FILTERS=<Filters>\n"
       "  If MOZ_PROFILER_STARTUP is set, specifies the thread filters, as a\n"
-      "  comma-separated list of strings. A given thread will be sampled if "
-      "any\n"
-      "  of the filters is a case-insensitive substring of the thread name.\n"
-      "  If unset, a default is used.\n"
+      "  comma-separated list of strings. A given thread will be sampled if\n"
+      "  any of the filters is a case-insensitive substring of the thread\n"
+      "  name. If unset, a default is used.\n"
       "\n"
       "  MOZ_PROFILER_SHUTDOWN\n"
       "  If set, the profiler saves a profile to the named file on shutdown.\n"
       "\n"
       "  MOZ_PROFILER_LUL_TEST\n"
       "  If set to any value, runs LUL unit tests at startup.\n"
       "\n"
       "  This platform %s native unwinding.\n"