jenkins-bot has submitted this change and it was merged.
Change subject: Added additional tracing to aid T112686
......................................................................
Added additional tracing to aid T112686
Change-Id: I733b9327673d528deb7b5b03498bf5e4f52133df
---
M lib/mediawiki.Batcher.js
M lib/mediawiki.TokenTransformManager.js
2 files changed, 7 insertions(+), 3 deletions(-)
Approvals:
Subramanya Sastry: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/mediawiki.Batcher.js b/lib/mediawiki.Batcher.js
index 15eae28..18c5e15 100644
--- a/lib/mediawiki.Batcher.js
+++ b/lib/mediawiki.Batcher.js
@@ -91,6 +91,9 @@
*/
Batcher.prototype.scheduleIdle = function() {
if (!this.idleTimer) {
+ this.trace("Scheduling onIdle timer with outstanding =",
this.numOutstanding,
+ ", pending =", this.pendingBatches.length, "x",
this.maxBatchSize,
+ ", current =", this.currentBatch.length);
this.idleTimer = setTimeout(this.onIdle.bind(this), 0);
}
};
diff --git a/lib/mediawiki.TokenTransformManager.js
b/lib/mediawiki.TokenTransformManager.js
index 3798129..5c12737 100644
--- a/lib/mediawiki.TokenTransformManager.js
+++ b/lib/mediawiki.TokenTransformManager.js
@@ -412,13 +412,13 @@
*/
AsyncTokenTransformManager.prototype.onEndEvent = function() {
if (this.tailAccumulator) {
- this.env.dp('AsyncTokenTransformManager.onEndEvent: calling
siblingDone',
+ this.env.log(this.traceType, this.pipelineId,
'AsyncTokenTransformManager.onEndEvent: calling siblingDone',
this.frame.title);
this.env.batcher.scheduleIdle();
this.tailAccumulator.siblingDone();
} else {
// nothing was asynchronous, so we'll have to emit end here.
- this.env.dp('AsyncTokenTransformManager.onEndEvent: synchronous
done',
+ this.env.log(this.traceType, this.pipelineId,
'AsyncTokenTransformManager.onEndEvent: synchronous done',
this.frame.title);
this.emit('end');
@@ -954,6 +954,8 @@
* @private
*/
SyncTokenTransformManager.prototype.onEndEvent = function() {
+ this.env.log(this.traceType, this.pipelineId,
'SyncTokenTransformManager.onEndEvent');
+
// This phase is fully synchronous, so just pass the end along and
prepare
// for the next round.
this.prevToken = null;
@@ -1235,7 +1237,6 @@
*/
TokenAccumulator.prototype.receiveToksFromSibling = function(ret) {
ret = verifyTokensIntegrity(this.manager.env, ret, false);
- // console.warn("\nTA-" + this.uid + "; c: " + this.waitForChild + ";
s: " + this.waitForSibling + " <-- from sibling: " + JSON.stringify(ret));
if (!ret.async) {
this.waitForSibling = false;
--
To view, visit https://gerrit.wikimedia.org/r/238769
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I733b9327673d528deb7b5b03498bf5e4f52133df
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/services/parsoid
Gerrit-Branch: master
Gerrit-Owner: Subramanya Sastry <[email protected]>
Gerrit-Reviewer: Cscott <[email protected]>
Gerrit-Reviewer: Subramanya Sastry <[email protected]>
Gerrit-Reviewer: Tim Starling <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
