Bug 1374975 - Fix incorrect arguments to NotifyProfilerStarted. r=mstange.

--HG--
extra : rebase_source : e9f5b60c6126c9a6295616e9ab0e815a65a28c1a

tools/profiler/core/platform.cpp

@@ -2126,6 +2126,9 @@ profiler_init(void* aStackTop)
     PrintUsageThenExit(0); // terminates execution
   }
 
+  int entries = PROFILER_DEFAULT_ENTRIES;
+  double interval = PROFILER_DEFAULT_INTERVAL;
+
   {
     PSAutoLock lock(gPSMutex);
 
@@ -2163,7 +2166,6 @@ profiler_init(void* aStackTop)
 
     LOG("- MOZ_PROFILER_STARTUP is set");
 
-    int entries = PROFILER_DEFAULT_ENTRIES;
     const char* startupEntries = getenv("MOZ_PROFILER_STARTUP_ENTRIES");
     if (startupEntries) {
       errno = 0;
@@ -2175,7 +2177,6 @@ profiler_init(void* aStackTop)
       }
     }
 
-    double interval = PROFILER_DEFAULT_INTERVAL;
     const char* startupInterval = getenv("MOZ_PROFILER_STARTUP_INTERVAL");
     if (startupInterval) {
       errno = 0;
@@ -2193,8 +2194,8 @@ profiler_init(void* aStackTop)
 
   // We do this with gPSMutex unlocked. The comment in profiler_stop() explains
   // why.
-  NotifyProfilerStarted(PROFILER_DEFAULT_ENTRIES, PROFILER_DEFAULT_INTERVAL,
-                        features, filters, MOZ_ARRAY_LENGTH(filters));
+  NotifyProfilerStarted(entries, interval, features, filters,
+                        MOZ_ARRAY_LENGTH(filters));
 }
 
 static void