bug 1219466 - convert netwerk to LazyLogModule r=valentin.gosu

Author: mcmanus

dom/base/nsDOMDataChannel.cpp

@@ -9,11 +9,6 @@
 #include "base/basictypes.h"
 #include "mozilla/Logging.h"
 
-extern PRLogModuleInfo* GetDataChannelLog();
-#undef LOG
-#define LOG(args) MOZ_LOG(GetDataChannelLog(), mozilla::LogLevel::Debug, args)
-
-
 #include "nsDOMDataChannelDeclarations.h"
 #include "nsDOMDataChannel.h"
 #include "nsIDOMDataChannel.h"
@@ -29,6 +24,10 @@ extern PRLogModuleInfo* GetDataChannelLog();
 #include "nsIScriptObjectPrincipal.h"
 
 #include "DataChannel.h"
+#include "DataChannelLog.h"
+
+#undef LOG
+#define LOG(args) MOZ_LOG(mozilla::gDataChannelLog, mozilla::LogLevel::Debug, args)
 
 // Since we've moved the windows.h include down here, we have to explicitly
 // undef GetBinaryType, otherwise we'll get really odd conflicts

dom/network/UDPSocket.h

@@ -21,7 +21,7 @@ struct JSContext;
 //
 // set NSPR_LOG_MODULES=UDPSocket:5
 //
-extern PRLogModuleInfo *gUDPSocketLog;
+extern mozilla::LazyLogModule gUDPSocketLog;
 #define UDPSOCKET_LOG(args)     MOZ_LOG(gUDPSocketLog, mozilla::LogLevel::Debug, args)
 #define UDPSOCKET_LOG_ENABLED() MOZ_LOG_TEST(gUDPSocketLog, mozilla::LogLevel::Debug)
 

dom/network/UDPSocketChild.cpp

@@ -20,7 +20,7 @@ using mozilla::net::gNeckoChild;
 //
 // set NSPR_LOG_MODULES=UDPSocket:5
 //
-extern PRLogModuleInfo *gUDPSocketLog;
+extern mozilla::LazyLogModule gUDPSocketLog;
 #define UDPSOCKET_LOG(args)     MOZ_LOG(gUDPSocketLog, mozilla::LogLevel::Debug, args)
 #define UDPSOCKET_LOG_ENABLED() MOZ_LOG_TEST(gUDPSocketLog, mozilla::LogLevel::Debug)
 

dom/network/UDPSocketParent.cpp

@@ -25,7 +25,7 @@
 //
 // set NSPR_LOG_MODULES=UDPSocket:5
 //
-extern PRLogModuleInfo *gUDPSocketLog;
+extern mozilla::LazyLogModule gUDPSocketLog;
 #define UDPSOCKET_LOG(args)     MOZ_LOG(gUDPSocketLog, mozilla::LogLevel::Debug, args)
 #define UDPSOCKET_LOG_ENABLED() MOZ_LOG_TEST(gUDPSocketLog, mozilla::LogLevel::Debug)
 

netwerk/base/BackgroundFileSaver.cpp

@@ -33,9 +33,9 @@ namespace mozilla {
 namespace net {
 
 // NSPR_LOG_MODULES=BackgroundFileSaver:5
-PRLogModuleInfo *BackgroundFileSaver::prlog = nullptr;
-#define LOG(args) MOZ_LOG(BackgroundFileSaver::prlog, mozilla::LogLevel::Debug, args)
-#define LOG_ENABLED() MOZ_LOG_TEST(BackgroundFileSaver::prlog, mozilla::LogLevel::Debug)
+static LazyLogModule prlog("BackgroundFileSaver");
+#define LOG(args) MOZ_LOG(prlog, mozilla::LogLevel::Debug, args)
+#define LOG_ENABLED() MOZ_LOG_TEST(prlog, mozilla::LogLevel::Debug)
 
 ////////////////////////////////////////////////////////////////////////////////
 //// Globals
@@ -110,8 +110,6 @@ BackgroundFileSaver::BackgroundFileSaver()
 , mActualTargetKeepPartial(false)
 , mDigestContext(nullptr)
 {
-  if (!prlog)
-    prlog = PR_NewLogModule("BackgroundFileSaver");
   LOG(("Created BackgroundFileSaver [this = %p]", this));
 }
 

netwerk/base/BackgroundFileSaver.h

@@ -25,7 +25,6 @@
 class nsIAsyncInputStream;
 class nsIThread;
 class nsIX509CertList;
-struct PRLogModuleInfo;
 
 namespace mozilla {
 namespace net {
@@ -74,8 +73,6 @@ class BackgroundFileSaver : public nsIBackgroundFileSaver,
 protected:
   virtual ~BackgroundFileSaver();
 
-  static PRLogModuleInfo *prlog;
-
   /**
    * Helper function for managing NSS objects (mDigestContext).
    */

netwerk/base/CaptivePortalService.cpp

@@ -16,13 +16,13 @@ static const char kCaptivePortalLoginSuccessEvent[] = "captive-portal-login-succ
 
 static const uint32_t kDefaultInterval = 60*1000; // check every 60 seconds
 
-static PRLogModuleInfo *gCaptivePortalLog = nullptr;
-#undef LOG
-#define LOG(args) MOZ_LOG(gCaptivePortalLog, mozilla::LogLevel::Debug, args)
-
 namespace mozilla {
 namespace net {
 
+static LazyLogModule gCaptivePortalLog("CaptivePortalService");
+#undef LOG
+#define LOG(args) MOZ_LOG(gCaptivePortalLog, mozilla::LogLevel::Debug, args)
+
 NS_IMPL_ISUPPORTS(CaptivePortalService, nsICaptivePortalService, nsIObserver,
                   nsISupportsWeakReference, nsITimerCallback,
                   nsICaptivePortalCallback)
@@ -101,10 +101,6 @@ CaptivePortalService::Initialize()
   }
   mInitialized = true;
 
-  if (!gCaptivePortalLog) {
-    gCaptivePortalLog = PR_NewLogModule("CaptivePortalService");
-  }
-
   nsCOMPtr<nsIObserverService> observerService =
     mozilla::services::GetObserverService();
   if (observerService) {

netwerk/base/Predictor.cpp

@@ -56,7 +56,8 @@ namespace net {
 
 Predictor *Predictor::sSelf = nullptr;
 
-static PRLogModuleInfo *gPredictorLog = nullptr;
+static LazyLogModule gPredictorLog("NetworkPredictor");
+
 #define PREDICTOR_LOG(args) MOZ_LOG(gPredictorLog, mozilla::LogLevel::Debug, args)
 
 #define RETURN_IF_FAILED(_rv) \
@@ -322,8 +323,6 @@ Predictor::Predictor()
   ,mStartupCount(1)
   ,mMaxURILength(PREDICTOR_MAX_URI_LENGTH_DEFAULT)
 {
-  gPredictorLog = PR_NewLogModule("NetworkPredictor");
-
   MOZ_ASSERT(!sSelf, "multiple Predictor instances!");
   sSelf = this;
 }

netwerk/base/nsAsyncRedirectVerifyHelper.cpp

@@ -13,16 +13,9 @@
 #include "nsIHttpChannelInternal.h"
 #include "nsIAsyncVerifyRedirectCallback.h"
 
+static mozilla::LazyLogModule gRedirectLog("nsRedirect");
 #undef LOG
-static PRLogModuleInfo *
-GetRedirectLog()
-{
-    static PRLogModuleInfo *sLog;
-    if (!sLog)
-        sLog = PR_NewLogModule("nsRedirect");
-    return sLog;
-}
-#define LOG(args) MOZ_LOG(GetRedirectLog(), mozilla::LogLevel::Debug, args)
+#define LOG(args) MOZ_LOG(gRedirectLog, mozilla::LogLevel::Debug, args)
 
 NS_IMPL_ISUPPORTS(nsAsyncRedirectVerifyHelper,
                   nsIAsyncVerifyRedirectCallback,

netwerk/base/nsAsyncStreamCopier.cpp

@@ -19,7 +19,7 @@ using namespace mozilla;
 //
 // NSPR_LOG_MODULES=nsStreamCopier:5
 //
-static PRLogModuleInfo *gStreamCopierLog = nullptr;
+static LazyLogModule gStreamCopierLog("nsStreamCopier");
 #define LOG(args) MOZ_LOG(gStreamCopierLog, mozilla::LogLevel::Debug, args)
 
 /**
@@ -70,8 +70,6 @@ nsAsyncStreamCopier::nsAsyncStreamCopier()
     , mIsPending(false)
     , mShouldSniffBuffering(false)
 {
-    if (!gStreamCopierLog)
-        gStreamCopierLog = PR_NewLogModule("nsStreamCopier");
     LOG(("Creating nsAsyncStreamCopier @%x\n", this));
 }
 

netwerk/base/nsAutodialWin.cpp

@@ -29,8 +29,7 @@
 // the file nspr.log
 //
 
-static PRLogModuleInfo* gLog = nullptr;
-
+static mozilla::LazyLogModule gLog("Autodial");
 #undef LOGD
 #undef LOGE
 #define LOGD(args) MOZ_LOG(gLog, mozilla::LogLevel::Debug, args)
@@ -62,9 +61,6 @@ nsAutodial::~nsAutodial()
 // Returns NS_ERROR_FAILURE if error or NS_OK if success.
 nsresult nsAutodial::Init()
 {
-    if (!gLog)
-        gLog = PR_NewLogModule("Autodial");
-
     mDefaultEntryName[0] = '\0';
     mNumRASConnectionEntries = 0;
     mAutodialBehavior = QueryAutodialBehavior();

netwerk/base/nsChannelClassifier.cpp

@@ -40,7 +40,8 @@ using mozilla::Preferences;
 //
 // NSPR_LOG_MODULES=nsChannelClassifier:5
 //
-static PRLogModuleInfo *gChannelClassifierLog;
+static mozilla::LazyLogModule gChannelClassifierLog("nsChannelClassifier");
+
 #undef LOG
 #define LOG(args)     MOZ_LOG(gChannelClassifierLog, mozilla::LogLevel::Debug, args)
 #define LOG_ENABLED() MOZ_LOG_TEST(gChannelClassifierLog, mozilla::LogLevel::Debug)
@@ -52,8 +53,6 @@ nsChannelClassifier::nsChannelClassifier()
   : mIsAllowListed(false),
     mSuspendedChannel(false)
 {
-    if (!gChannelClassifierLog)
-        gChannelClassifierLog = PR_NewLogModule("nsChannelClassifier");
 }
 
 nsresult

netwerk/base/nsDirectoryIndexStream.cpp

@@ -18,8 +18,6 @@
 #include "nsDirectoryIndexStream.h"
 #include "mozilla/Logging.h"
 #include "prtime.h"
-static PRLogModuleInfo* gLog;
-
 #include "nsISimpleEnumerator.h"
 #ifdef THREADSAFE_I18N
 #include "nsCollationCID.h"
@@ -41,12 +39,11 @@ static PRLogModuleInfo* gLog;
 
 //#define THREADSAFE_I18N
 
+static mozilla::LazyLogModule gLog("nsDirectoryIndexStream");
+
 nsDirectoryIndexStream::nsDirectoryIndexStream()
     : mOffset(0), mStatus(NS_OK), mPos(0)
 {
-    if (! gLog)
-        gLog = PR_NewLogModule("nsDirectoryIndexStream");
-
     MOZ_LOG(gLog, LogLevel::Debug,
            ("nsDirectoryIndexStream[%p]: created", this));
 }

netwerk/base/nsInputStreamPump.cpp

@@ -24,7 +24,7 @@ static NS_DEFINE_CID(kStreamTransportServiceCID, NS_STREAMTRANSPORTSERVICE_CID);
 //
 // NSPR_LOG_MODULES=nsStreamPump:5
 //
-static PRLogModuleInfo *gStreamPumpLog = nullptr;
+static mozilla::LazyLogModule gStreamPumpLog("nsStreamPump");
 #undef LOG
 #define LOG(args) MOZ_LOG(gStreamPumpLog, mozilla::LogLevel::Debug, args)
 
@@ -45,8 +45,6 @@ nsInputStreamPump::nsInputStreamPump()
     , mRetargeting(false)
     , mMonitor("nsInputStreamPump")
 {
-    if (!gStreamPumpLog)
-        gStreamPumpLog = PR_NewLogModule("nsStreamPump");
 }
 
 nsInputStreamPump::~nsInputStreamPump()

netwerk/base/nsLoadGroup.cpp

@@ -38,8 +38,7 @@ using namespace mozilla::net;
 // this enables LogLevel::Debug level information and places all output in
 // the file nspr.log
 //
-static PRLogModuleInfo* gLoadGroupLog = nullptr;
-
+static LazyLogModule gLoadGroupLog("LoadGroup");
 #undef LOG
 #define LOG(args) MOZ_LOG(gLoadGroupLog, mozilla::LogLevel::Debug, args)
 
@@ -117,11 +116,6 @@ nsLoadGroup::nsLoadGroup(nsISupports* outer)
     , mTimedNonCachedRequestsUntilOnEndPageLoad(0)
 {
     NS_INIT_AGGREGATED(outer);
-
-    // Initialize the global PRLogModule for nsILoadGroup logging
-    if (nullptr == gLoadGroupLog)
-        gLoadGroupLog = PR_NewLogModule("LoadGroup");
-
     LOG(("LOADGROUP [%x]: Created.\n", this));
 }
 

netwerk/base/nsPACMan.cpp

@@ -25,8 +25,14 @@
 using namespace mozilla;
 using namespace mozilla::net;
 
+namespace mozilla {
+namespace net {
+LazyLogModule gProxyLog("proxy");
+} // namespace net
+} // namespace mozilla
+
 #undef LOG
-#define LOG(args) MOZ_LOG(GetProxyLog(), mozilla::LogLevel::Debug, args)
+#define LOG(args) MOZ_LOG(mozilla::net::gProxyLog, mozilla::LogLevel::Debug, args)
 
 // The PAC thread does evaluations of both PAC files and
 // nsISystemProxySettings because they can both block the calling thread and we
@@ -768,17 +774,3 @@ nsPACMan::Init(nsISystemProxySettings *systemProxySettings)
   return NS_OK;
 }
 
-namespace mozilla {
-namespace net {
-
-PRLogModuleInfo*
-GetProxyLog()
-{
-    static PRLogModuleInfo *sLog;
-    if (!sLog)
-        sLog = PR_NewLogModule("proxy");
-    return sLog;
-}
-
-} // namespace net
-} // namespace mozilla

netwerk/base/nsPACMan.h

@@ -241,7 +241,7 @@ class nsPACMan final : public nsIStreamLoaderObserver
 
 namespace mozilla {
 namespace net {
-PRLogModuleInfo* GetProxyLog();
+extern LazyLogModule gProxyLog;
 } // namespace net
 } // namespace mozilla
 

netwerk/base/nsProtocolProxyService.cpp

@@ -49,7 +49,7 @@ using namespace mozilla;
 
 #include "mozilla/Logging.h"
 #undef LOG
-#define LOG(args) MOZ_LOG(net::GetProxyLog(), mozilla::LogLevel::Debug, args)
+#define LOG(args) MOZ_LOG(net::gProxyLog, mozilla::LogLevel::Debug, args)
 
 //----------------------------------------------------------------------------
 

netwerk/base/nsRequestObserverProxy.cpp

@@ -13,7 +13,7 @@
 
 using namespace mozilla;
 
-static PRLogModuleInfo *gRequestObserverProxyLog;
+static LazyLogModule gRequestObserverProxyLog("nsRequestObserverProxy");
 
 #undef LOG
 #define LOG(args) MOZ_LOG(gRequestObserverProxyLog, mozilla::LogLevel::Debug, args)
@@ -173,10 +173,6 @@ NS_IMETHODIMP
 nsRequestObserverProxy::Init(nsIRequestObserver *observer, nsISupports *context)
 {
     NS_ENSURE_ARG_POINTER(observer);
-
-    if (!gRequestObserverProxyLog)
-        gRequestObserverProxyLog = PR_NewLogModule("nsRequestObserverProxy");
-
     mObserver = new nsMainThreadPtrHolder<nsIRequestObserver>(observer);
     mContext = new nsMainThreadPtrHolder<nsISupports>(context);
 

netwerk/base/nsSecCheckWrapChannel.cpp

@@ -8,17 +8,8 @@
 #include "nsIForcePendingChannel.h"
 #include "nsCOMPtr.h"
 
-static PRLogModuleInfo*
-GetChannelWrapperLog()
-{
-  static PRLogModuleInfo* gChannelWrapperPRLog;
-  if (!gChannelWrapperPRLog) {
-    gChannelWrapperPRLog = PR_NewLogModule("ChannelWrapper");
-  }
-  return gChannelWrapperPRLog;
-}
-
-#define CHANNELWRAPPERLOG(args) MOZ_LOG(GetChannelWrapperLog(), mozilla::LogLevel::Debug, args)
+static mozilla::LazyLogModule gChannelWrapperLog("ChannelWrapper");
+#define CHANNELWRAPPERLOG(args) MOZ_LOG(gChannelWrapperLog, mozilla::LogLevel::Debug, args)
 
 NS_IMPL_ADDREF(nsSecCheckWrapChannelBase)
 NS_IMPL_RELEASE(nsSecCheckWrapChannelBase)

netwerk/base/nsSocketTransportService2.cpp

@@ -29,8 +29,8 @@
 using namespace mozilla;
 using namespace mozilla::net;
 
-PRLogModuleInfo *gSocketTransportLog = nullptr;
-PRLogModuleInfo *gUDPSocketLog = nullptr;
+LazyLogModule gSocketTransportLog("nsSocketTransport");
+LazyLogModule gUDPSocketLog("UDPSocket");
 
 nsSocketTransportService *gSocketTransportService = nullptr;
 PRThread                 *gSocketThread           = nullptr;
@@ -111,9 +111,6 @@ nsSocketTransportService::nsSocketTransportService()
     , mTelemetryEnabledPref(false)
     , mProbedMaxCount(false)
 {
-    gSocketTransportLog = PR_NewLogModule("nsSocketTransport");
-    gUDPSocketLog = PR_NewLogModule("UDPSocket");
-
     NS_ASSERTION(NS_IsMainThread(), "wrong thread");
 
     PR_CallOnce(&gMaxCountInitOnce, DiscoverMaxCount);