Bug 831303 - Comment the assert. r=ehsan.
authorRafael Ávila de Espíndola <respindola@mozilla.org>
Fri, 18 Jan 2013 11:14:31 -0500
changeset 119271 2bee7c8730dc1d1b3a91845dc6288225d0d2a05a
parent 119270 14941916760d7219b5b753c4c28f29be7513f960
child 119272 7b531a62b114979ae20fee7466a37d47cf851379
push id24195
push userMs2ger@gmail.com
push dateSat, 19 Jan 2013 16:10:11 +0000
treeherdermozilla-central@02e12a80aef9 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersehsan
bugs831303
milestone21.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 831303 - Comment the assert. r=ehsan.
toolkit/components/telemetry/Telemetry.cpp
--- a/toolkit/components/telemetry/Telemetry.cpp
+++ b/toolkit/components/telemetry/Telemetry.cpp
@@ -1993,18 +1993,22 @@ const Module kTelemetryModule = {
 };
 
 } // anonymous namespace
 
 namespace mozilla {
 void
 RecordShutdownStartTimeStamp() {
 #ifdef DEBUG
+  // FIXME: this function should only be called once, since it should be called
+  // at the earliest point we *know* we are shutting down. Unfortunately
+  // this assert has been firing. Given that if we are called multiple times
+  // we just keep the last timestamp, the assert is commented for now.
   static bool recorded = false;
-  MOZ_ASSERT(!recorded);
+  //  MOZ_ASSERT(!recorded);
   recorded = true;
 #endif
 
   if (!Telemetry::CanRecord())
     return;
 
   gRecordedShutdownStartTime = TimeStamp::Now();