[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Tweak time tracing of DOM passes for nested (non-top-level) ...
jenkins-bot has submitted this change and it was merged. Change subject: Tweak time tracing of DOM passes for nested (non-top-level) docs. .. Tweak time tracing of DOM passes for nested (non-top-level) docs. * Use a debug log level for printing detailed time info for nested docs. parse.js --debug time/dompp vs. parse.js --trace time/dompp * Accumulate total time spent on DOM passes on nested documents vs. the top level document. Change-Id: Ifb171dcb8500523a490869b01bbd850f1aa9 --- M lib/wt2html/DOMPostProcessor.js 1 file changed, 16 insertions(+), 6 deletions(-) Approvals: Arlolra: Looks good to me, approved jenkins-bot: Verified diff --git a/lib/wt2html/DOMPostProcessor.js b/lib/wt2html/DOMPostProcessor.js index 1548c28..e38cc6a 100644 --- a/lib/wt2html/DOMPostProcessor.js +++ b/lib/wt2html/DOMPostProcessor.js @@ -394,11 +394,20 @@ }); } - var startTime, endTime, prefix; + var startTime, endTime, prefix, logLevel, resourceCategory; if (tracePP) { - prefix = (this.atTopLevel ? "TOP" : "---"); + if (this.atTopLevel) { + prefix = "TOP"; + // Turn off DOM pass timing tracing on non-top-level documents + logLevel = "trace/time/dompp"; + resourceCategory = "DOMPasses:TOP"; + } else { + prefix = "---"; + logLevel = "debug/time/dompp"; + resourceCategory = "DOMPasses:NESTED"; + } startTime = new Date(); - env.log("trace/time/dompp", prefix + "; start=" + startTime); + env.log(logLevel, prefix + "; start=" + startTime); } for (var i = 0; i < this.processors.length; i++) { var pp = this.processors[i]; @@ -407,12 +416,13 @@ if (tracePP) { ppName = pp.name + ' '.repeat(pp.name.length < 30 ? 30 - pp.name.length : 0); ppStart = new Date(); - env.log("trace/time/dompp", prefix + "; " + ppName + " start"); + env.log(logLevel, prefix + "; " + ppName + " start"); } pp.proc(document.body, env, this.options, this.atTopLevel); if (tracePP) { ppEnd = new Date(); - env.log("trace/time/dompp", prefix + "; " + ppName + " end; time = " + (ppEnd - ppStart)); + env.log(logLevel, prefix + "; " + ppName + " end; time = " + (ppEnd - ppStart)); + env.bumpTimeUse(resourceCategory, (ppEnd - ppStart)); } } catch (e) { env.log('fatal', e); @@ -421,7 +431,7 @@ } if (tracePP) { endTime = new Date(); - env.log("trace/time/dompp", prefix + "; end=" + endTime + "; time = " + (endTime - startTime)); + env.log(logLevel, prefix + "; end=" + endTime + "; time = " + (endTime - startTime)); } // For sub-pipeline documents, we are done. -- To view, visit https://gerrit.wikimedia.org/r/302067 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ifb171dcb8500523a490869b01bbd850f1aa9 Gerrit-PatchSet: 6 Gerrit-Project: mediawiki/services/parsoid Gerrit-Branch: master Gerrit-Owner: Subramanya SastryGerrit-Reviewer: Arlolra Gerrit-Reviewer: Cscott Gerrit-Reviewer: Legoktm Gerrit-Reviewer: Tim Starling Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...parsoid[master]: Tweak time tracing of DOM passes for nested (non-top-level) ...
Subramanya Sastry has uploaded a new change for review. https://gerrit.wikimedia.org/r/302067 Change subject: Tweak time tracing of DOM passes for nested (non-top-level) docs. .. Tweak time tracing of DOM passes for nested (non-top-level) docs. * Use a debug log level for printing detailed time info for nested docs. parse.js --debug time/dompp vs. parse.js --trace time/dompp * Accumulate total time spent on DOM passes on nested documents vs. the top level document. Change-Id: Ifb171dcb8500523a490869b01bbd850f1aa9 --- M lib/wt2html/DOMPostProcessor.js 1 file changed, 16 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid refs/changes/67/302067/1 diff --git a/lib/wt2html/DOMPostProcessor.js b/lib/wt2html/DOMPostProcessor.js index fecdeae..2071864 100644 --- a/lib/wt2html/DOMPostProcessor.js +++ b/lib/wt2html/DOMPostProcessor.js @@ -397,11 +397,20 @@ }); } - var startTime, endTime, prefix; + var startTime, endTime, prefix, logLevel, resourceCategory; if (tracePP) { - prefix = (this.atTopLevel ? "TOP" : "---"); + if (this.atTopLevel) { + prefix = "TOP"; + logLevel = "trace/time/dompp"; + resourceCategory = "DOMPasses:TOP"; + } else { + prefix = this.atTopLevel ? "TOP" : "---"; + // Turn off DOM pass timing tracing on non-top-level documents + logLevel = "debug/time/dompp"; + resourceCategory = "DOMPasses:NESTED"; + } startTime = new Date(); - env.log("trace/time/dompp", prefix + "; start=" + startTime); + env.log(logLevel, prefix + "; start=" + startTime); } for (var i = 0; i < this.processors.length; i++) { var pp = this.processors[i]; @@ -410,12 +419,13 @@ if (tracePP) { ppName = pp.name + ' '.repeat(pp.name.length < 30 ? 30 - pp.name.length : 0); ppStart = new Date(); - env.log("trace/time/dompp", prefix + "; " + ppName + " start"); + env.log(logLevel, prefix + "; " + ppName + " start"); } pp.proc(document.body, env, this.options, this.atTopLevel); if (tracePP) { ppEnd = new Date(); - env.log("trace/time/dompp", prefix + "; " + ppName + " end; time = " + (ppEnd - ppStart)); + env.log(logLevel, prefix + "; " + ppName + " end; time = " + (ppEnd - ppStart)); + env.bumpTimeUse(resourceCategory, (ppEnd - ppStart)); } } catch (e) { env.log('fatal', e); @@ -424,7 +434,7 @@ } if (tracePP) { endTime = new Date(); - env.log("trace/time/dompp", prefix + "; end=" + endTime + "; time = " + (endTime - startTime)); + env.log(logLevel, prefix + "; end=" + endTime + "; time = " + (endTime - startTime)); } // For sub-pipeline documents, we are done. -- To view, visit https://gerrit.wikimedia.org/r/302067 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifb171dcb8500523a490869b01bbd850f1aa9 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/parsoid Gerrit-Branch: master Gerrit-Owner: Subramanya Sastry___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits