Bug 799640 - Part 3: Add shutdown labels. r=espindola

toolkit/components/startup/nsAppStartup.cpp

@@ -26,6 +26,7 @@
 #include "nsAutoPtr.h"
 #include "nsStringGlue.h"
 #include "mozilla/Preferences.h"
+#include "sampler.h"
 
 #include "prprf.h"
 #include "nsCRT.h"
@@ -387,6 +388,7 @@ nsAppStartup::Quit(uint32_t aMode)
   if (mShuttingDown)
     return NS_OK;
 
+  SAMPLE_MARKER("Shutdown start");
   RecordShutdownStartTimeStamp();
 
   // If we're considering quitting, we will only do so if:

toolkit/xre/nsAppRunner.cpp

@@ -1117,6 +1117,7 @@ ScopedXPCOMStartup::~ScopedXPCOMStartup()
       appStartup->DestroyHiddenWindow();
 
     gDirServiceProvider->DoShutdown();
+    SAMPLE_MARKER("Shutdown early");
 
     WriteConsoleLog();
 

xpcom/build/nsXPComInit.cpp

@@ -618,6 +618,7 @@ ShutdownXPCOM(nsIServiceManager* servMgr)
 
     nsCycleCollector_shutdown();
 
+    SAMPLE_MARKER("Shutdown xpcom");
     mozilla::PoisonWrite();
 
     if (moduleLoaders) {