Backed out changeset a1439ce8da77 (bug 1219482) to hopefully fix the intermittent hazard failures CLOSED TREE

b2g/app/nsBrowserApp.cpp

@@ -281,7 +281,6 @@ int main(int argc, _CONST char* argv[])
   int result;
   {
     ScopedLogging log;
-    mozilla::LogModule::Init();
     char **_argv;
 
     /*

uriloader/base/nsDocLoader.cpp

@@ -50,7 +50,7 @@ static NS_DEFINE_CID(kThisImplCID, NS_THIS_DOCLOADER_IMPL_CID);
 // this enables LogLevel::Debug level information and places all output in
 // the file nspr.log
 //
-mozilla::LazyLogModule gDocLoaderLog("DocLoader");
+PRLogModuleInfo* gDocLoaderLog = nullptr;
 
 
 #if defined(DEBUG)
@@ -115,6 +115,10 @@ nsDocLoader::nsDocLoader()
     mDontFlushLayout(false),
     mIsFlushingLayout(false)
 {
+  if (nullptr == gDocLoaderLog) {
+      gDocLoaderLog = PR_NewLogModule("DocLoader");
+  }
+
   ClearInternalProgress();
 
   MOZ_LOG(gDocLoaderLog, LogLevel::Debug,

uriloader/base/nsURILoader.cpp

@@ -50,7 +50,7 @@
 #include "mozilla/Attributes.h"
 #include "mozilla/Preferences.h"
 
-mozilla::LazyLogModule nsURILoader::mLog("URILoader");
+PRLogModuleInfo* nsURILoader::mLog = nullptr;
 
 #define LOG(args) MOZ_LOG(nsURILoader::mLog, mozilla::LogLevel::Debug, args)
 #define LOG_ERROR(args) MOZ_LOG(nsURILoader::mLog, mozilla::LogLevel::Error, args)
@@ -754,6 +754,9 @@ nsDocumentOpenInfo::TryContentListener(nsIURIContentListener* aListener,
 
 nsURILoader::nsURILoader()
 {
+  if (!mLog) {
+    mLog = PR_NewLogModule("URILoader");
+  }
 }
 
 nsURILoader::~nsURILoader()

uriloader/base/nsURILoader.h

@@ -49,9 +49,9 @@ protected:
   nsCOMArray<nsIWeakReference> m_listeners;
 
   /**
-   * Logging.  The module is called "URILoader"
+   * NSPR logging.  The module is called "URILoader"
    */
-  static mozilla::LazyLogModule mLog;
+  static PRLogModuleInfo* mLog;
   
   friend class nsDocumentOpenInfo;
 };

uriloader/exthandler/nsExternalHelperAppService.cpp

@@ -122,7 +122,7 @@ enum {
 , NS_FOLDER_VALUE_CUSTOM = 2
 };
 
-LazyLogModule nsExternalHelperAppService::mLog("HelperAppService");
+PRLogModuleInfo* nsExternalHelperAppService::mLog = nullptr;
 
 // Using level 3 here because the OSHelperAppServices use a log level
 // of LogLevel::Debug (4), and we want less detailed output here
@@ -657,6 +657,12 @@ nsresult nsExternalHelperAppService::Init()
   if (!obs)
     return NS_ERROR_FAILURE;
 
+  if (!mLog) {
+    mLog = PR_NewLogModule("HelperAppService");
+    if (!mLog)
+      return NS_ERROR_OUT_OF_MEMORY;
+  }
+
   nsresult rv = obs->AddObserver(this, "profile-before-change", true);
   NS_ENSURE_SUCCESS(rv, rv);
   return obs->AddObserver(this, "last-pb-context-exited", true);

uriloader/exthandler/nsExternalHelperAppService.h

@@ -146,7 +146,7 @@ protected:
    * where level should be 2 for errors, 3 for debug messages from the cross-
    * platform nsExternalHelperAppService, and 4 for os-specific debug messages.
    */
-  static mozilla::LazyLogModule mLog;
+  static PRLogModuleInfo* mLog;
 
   // friend, so that it can access the nspr log module.
   friend class nsExternalAppHandler;

uriloader/prefetch/OfflineCacheUpdateChild.cpp

@@ -46,7 +46,7 @@ using mozilla::dom::ContentChild;
 // this enables LogLevel::Debug level information and places all output in
 // the file offlineupdate.log
 //
-extern mozilla::LazyLogModule gOfflineCacheUpdateLog;
+extern PRLogModuleInfo *gOfflineCacheUpdateLog;
 
 #undef LOG
 #define LOG(args) MOZ_LOG(gOfflineCacheUpdateLog, mozilla::LogLevel::Debug, args)

uriloader/prefetch/OfflineCacheUpdateGlue.cpp

@@ -15,7 +15,7 @@
 #include "mozilla/Logging.h"
 
 //
-// To enable logging (see mozilla/Logging.h for full details):
+// To enable logging (see prlog.h for full details):
 //
 //    set NSPR_LOG_MODULES=nsOfflineCacheUpdate:5
 //    set NSPR_LOG_FILE=offlineupdate.log
@@ -23,7 +23,7 @@
 // this enables LogLevel::Info level information and places all output in
 // the file offlineupdate.log
 //
-extern mozilla::LazyLogModule gOfflineCacheUpdateLog;
+extern PRLogModuleInfo *gOfflineCacheUpdateLog;
 
 #undef LOG
 #define LOG(args) MOZ_LOG(gOfflineCacheUpdateLog, mozilla::LogLevel::Debug, args)

uriloader/prefetch/OfflineCacheUpdateParent.cpp

@@ -31,7 +31,7 @@ using mozilla::dom::TabParent;
 // this enables LogLevel::Debug level information and places all output in
 // the file offlineupdate.log
 //
-extern mozilla::LazyLogModule gOfflineCacheUpdateLog;
+extern PRLogModuleInfo *gOfflineCacheUpdateLog;
 
 #undef LOG
 #define LOG(args) MOZ_LOG(gOfflineCacheUpdateLog, mozilla::LogLevel::Debug, args)

uriloader/prefetch/nsOfflineCacheUpdate.cpp

@@ -61,7 +61,7 @@ static const int32_t  kCustomProfileQuota = 512000;
 // this enables LogLevel::Debug level information and places all output in
 // the file offlineupdate.log
 //
-extern LazyLogModule gOfflineCacheUpdateLog;
+extern PRLogModuleInfo *gOfflineCacheUpdateLog;
 
 #undef LOG
 #define LOG(args) MOZ_LOG(gOfflineCacheUpdateLog, mozilla::LogLevel::Debug, args)

uriloader/prefetch/nsOfflineCacheUpdateService.cpp

@@ -77,7 +77,7 @@ typedef mozilla::docshell::OfflineCacheUpdateGlue OfflineCacheUpdateGlue;
 // this enables LogLevel::Debug level information and places all output in
 // the file offlineupdate.log
 //
-LazyLogModule gOfflineCacheUpdateLog("nsOfflineCacheUpdate");
+PRLogModuleInfo *gOfflineCacheUpdateLog;
 
 #undef LOG
 #define LOG(args) MOZ_LOG(gOfflineCacheUpdateLog, mozilla::LogLevel::Debug, args)
@@ -257,6 +257,9 @@ nsOfflineCacheUpdateService::~nsOfflineCacheUpdateService()
 nsresult
 nsOfflineCacheUpdateService::Init()
 {
+    if (!gOfflineCacheUpdateLog)
+        gOfflineCacheUpdateLog = PR_NewLogModule("nsOfflineCacheUpdate");
+
     // Observe xpcom-shutdown event
     nsCOMPtr<nsIObserverService> observerService =
       mozilla::services::GetObserverService();

uriloader/prefetch/nsPrefetchService.cpp

@@ -36,7 +36,7 @@
 using namespace mozilla;
 
 //
-// To enable logging (see mozilla/Logging.h for full details):
+// To enable logging (see prlog.h for full details):
 //
 //    set NSPR_LOG_MODULES=nsPrefetch:5
 //    set NSPR_LOG_FILE=prefetch.log
@@ -44,7 +44,7 @@ using namespace mozilla;
 // this enables LogLevel::Debug level information and places all output in
 // the file http.log
 //
-static LazyLogModule gPrefetchLog("nsPrefetch");
+static PRLogModuleInfo *gPrefetchLog;
 
 #undef LOG
 #define LOG(args) MOZ_LOG(gPrefetchLog, mozilla::LogLevel::Debug, args)
@@ -333,6 +333,9 @@ nsPrefetchService::~nsPrefetchService()
 nsresult
 nsPrefetchService::Init()
 {
+    if (!gPrefetchLog)
+        gPrefetchLog = PR_NewLogModule("nsPrefetch");
+
     nsresult rv;
 
     // read prefs and hook up pref observer