1219478 - Replace PRLogModuleInfo usage with LazyLogModule in dom

Status: RESOLVED FIXED

(Core :: DOM: Core & HTML, defect)

Description

[Eric Rahm [:erahm]]

This covers replacing PRLogModuleInfo w/ LazyLogModule in everything in the 'dom/' directory except 'dom/media/'

Current usage:
> ./dom/plugins/base/nsPluginHost.cpp:323:  nsPluginLogging::gNPNLog = PR_NewLogModule(NPN_LOG_NAME);
> ./dom/plugins/base/nsPluginHost.cpp:324:  nsPluginLogging::gNPPLog = PR_NewLogModule(NPP_LOG_NAME);
> ./dom/plugins/base/nsPluginHost.cpp:325:  nsPluginLogging::gPluginLog = PR_NewLogModule(PLUGIN_LOG_NAME);
> ./dom/plugins/ipc/PluginMessageUtils.cpp:131:    sLog = PR_NewLogModule("IPCPlugins");
> ./dom/presentation/PresentationSessionInfo.cpp:43:  static PRLogModuleInfo* log = PR_NewLogModule("PresentationSessionInfo");
> ./dom/presentation/provider/MulticastDNSDeviceProvider.cpp:31:  static PRLogModuleInfo* log = PR_NewLogModule("MulticastDNSDeviceProvider");
> ./dom/security/nsCSPContext.cpp:53:    gCspContextPRLog = PR_NewLogModule("CSPContext");
> ./dom/security/nsCSPParser.cpp:27:    gCspParserPRLog = PR_NewLogModule("CSPParser");
> ./dom/security/nsCSPService.cpp:37:    gCspPRLog = PR_NewLogModule("CSP");
> ./dom/security/nsCSPUtils.cpp:22:    gCspUtilsPRLog = PR_NewLogModule("CSPUtils");
> ./dom/security/SRICheck.cpp:30:    gSriPRLog = PR_NewLogModule("SRI");
> ./dom/security/SRIMetadata.cpp:19:    gSriMetadataPRLog = PR_NewLogModule("SRIMetadata");
> ./dom/system/gonk/mozstumbler/StumblerLogging.cpp:11:  static PRLogModuleInfo* log = PR_NewLogModule("mozstumbler");
> ./dom/xslt/base/txLog.h:23:    txLog::xpath = PR_NewLogModule("xpath"); \
> ./dom/xslt/base/txLog.h:24:    txLog::xslt  = PR_NewLogModule("xslt")
> ./dom/xul/nsXULCommandDispatcher.cpp:49:    gCommandLog = PR_NewLogModule("nsXULCommandDispatcher");
> ./dom/xul/nsXULContentSink.cpp:167:        gContentSinkLog = PR_NewLogModule("nsXULContentSink");
> ./dom/xul/templates/nsXULTemplateBuilder.cpp:169:        gXULTemplateLog = PR_NewLogModule("nsXULTemplateBuilder");
> ./dom/xul/XULDocument.cpp:1891:        gXULLog = PR_NewLogModule("XULDocument");

Comment 1

[sajitk]

Attachment: Replace PRLogModuleInfo usage with LazyLogModule in dom folders except media

Comment 2

[sajitk]

https://treeherder.mozilla.org/#/jobs?repo=try&revision=747d2b97dfa1

Comment 3

[Andrea Marchesini [:baku]]

Comment on attachment 8688937 [details] [diff] [review]
Replace PRLogModuleInfo usage with LazyLogModule in dom folders except media

Review of attachment 8688937 [details] [diff] [review]:
-----------------------------------------------------------------

::: dom/base/ThirdPartyUtil.cpp
@@ +22,5 @@
>  
>  //
>  // NSPR_LOG_MODULES=thirdPartyUtil:5
>  //
> +static  mozilla::LazyLogModule gThirdPartyLog("thirdPartyUtil");

double space between static and mozilla::

::: dom/base/nsContentSink.cpp
@@ +953,5 @@
>  #ifdef DEBUG
>        nsAutoCString docURISpec, clientID;
>        mDocumentURI->GetAsciiSpec(docURISpec);
>        aLoadApplicationCache->GetClientID(clientID);
> +      SINK_TRACE(((mozilla::LogModule*)gContentSinkLogModuleInfo), SINK_TRACE_CALLS,

1. can you move SINK_TRACE_CALLS in a new line?
2. static_cast<mozilla::LogModule*>(gContentSinkLogModuleInfo)

@@ +1012,1 @@
>          ("Selection, no manifest: assigning app cache %s to document %s", clientID.get(), docURISpec.get()));

same here. I guess this is more than 80chars. + static_cast?

@@ +1322,5 @@
>  nsContentSink::WillInterruptImpl()
>  {
>    nsresult result = NS_OK;
>  
> +  SINK_TRACE(((mozilla::LogModule*)gContentSinkLogModuleInfo), SINK_TRACE_CALLS,

ditto.

@@ +1336,5 @@
>  
>        // If it's already time for us to have a notification
>        if (diff > interval || mDroppedTimer) {
>          mBackoffCount--;
> +        SINK_TRACE(((mozilla::LogModule*)gContentSinkLogModuleInfo), SINK_TRACE_REFLOW,

ditto.

@@ +1354,5 @@
>  
>          mNotificationTimer = do_CreateInstance("@mozilla.org/timer;1",
>                                                 &result);
>          if (NS_SUCCEEDED(result)) {
> +          SINK_TRACE(((mozilla::LogModule*)gContentSinkLogModuleInfo), SINK_TRACE_REFLOW,

ditto.

@@ +1368,5 @@
>          }
>        }
>      }
>    } else {
> +    SINK_TRACE(((mozilla::LogModule*)gContentSinkLogModuleInfo), SINK_TRACE_REFLOW,

ditto

@@ +1383,5 @@
>  
>  nsresult
>  nsContentSink::WillResumeImpl()
>  {
> +  SINK_TRACE(((mozilla::LogModule*)gContentSinkLogModuleInfo), SINK_TRACE_CALLS,

ditto

@@ +1503,5 @@
>    }
>  
>    // Cancel a timer if we had one out there
>    if (mNotificationTimer) {
> +    SINK_TRACE(((mozilla::LogModule*)gContentSinkLogModuleInfo), SINK_TRACE_REFLOW,

ditto

::: dom/indexedDB/IndexedDatabaseManager.h
@@ +17,5 @@
>  #include "nsCOMPtr.h"
>  #include "nsHashKeys.h"
>  #include "nsITimer.h"
>  
> +//struct PRLogModuleInfo;

remove this.

::: dom/xul/XULDocument.h
@@ +42,5 @@
>  #endif
>  #include "nsURIHashKey.h"
>  #include "nsInterfaceHashtable.h"
>  
> +//struct PRLogModuleInfo;

remove this.

Comment 4

[sajitk]

Attachment: 1219478.patch

Updated with review comments

Comment 5

[Carsten Book [:Tomcat]]

Hi, this failed to apply:

renamed 1219478 -> 1219478.patch
applying 1219478.patch
patching file dom/base/nsContentPolicy.cpp
Hunk #1 FAILED at 24
1 out of 1 hunks FAILED -- saving rejects to file dom/base/nsContentPolicy.cpp.rej
patching file dom/base/nsFocusManager.cpp
Hunk #2 FAILED at 188
1 out of 2 hunks FAILED -- saving rejects to file dom/base/nsFocusManager.cpp.rej

can you take a look ? Thanks!

Comment 6

[sajitk]

Attachment: 1219478.patch

Comment 7

[Carsten Book [:Tomcat]]

Hi, this failed again to apply: could you take a look, thanks!

patching file dom/indexedDB/IndexedDatabaseManager.cpp
Hunk #1 FAILED at 285
1 out of 3 hunks FAILED -- saving rejects to file dom/indexedDB/IndexedDatabaseManager.cpp.rej
patching file dom/indexedDB/IndexedDatabaseManager.h
Hunk #1 FAILED at 12
Hunk #3 FAILED at 208
2 out of 3 hunks FAILED -- saving rejects to file dom/indexedDB/IndexedDatabaseManager.h.rej
patch failed, unable to continue (try -v)
patch failed, rejects left in working directory
errors during apply, please fix and refresh 1219478.patch

Comment 8

[sajitk]

Attachment: 1219478.patch

Comment 9

[Pulsebot]

https://hg.mozilla.org/integration/mozilla-inbound/rev/c728b4bd9be6

Comment 10

[Wes Kocher (:KWierso) (Not reading bugmail; email directly if needed)]

https://hg.mozilla.org/integration/mozilla-inbound/rev/c728b4bd9be6

Comment 11

[Wes Kocher (:KWierso) (Not reading bugmail; email directly if needed)]

https://hg.mozilla.org/mozilla-central/rev/c728b4bd9be6