jenkins-bot has submitted this change and it was merged.
Change subject: Point Doxygen input filter to Zend PHP
......................................................................
Point Doxygen input filter to Zend PHP
On Trusty instances, 'php' refers to HHVM which has a rather large byte
code cache overhead. That slow down the invocation of mwdoc-filter.php
from 40ms (Zend) to 200+ms (PHP).
Set $wgPhpCli to the Zend version of PHP ('/usr/bin/php5') so invocation
of wfShellWikiCmd() ends up using it when crafting the doxygen
INPUT_FILTER.
With HHVM the doc generation takes up to 20 minutes. With this patch we
are down to 6 minutes (without graph generation) which is slightly
better.
Bug: 73311
Change-Id: I48b62c9213faab2f114c41922484def8d90f9426
---
M tools/mwcore-docgen.sh
1 file changed, 5 insertions(+), 1 deletion(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tools/mwcore-docgen.sh b/tools/mwcore-docgen.sh
index 32c5854..7b8209c 100755
--- a/tools/mwcore-docgen.sh
+++ b/tools/mwcore-docgen.sh
@@ -58,7 +58,11 @@
# Craft a dumb LocalSettings.php which is required by Maintenance script
# albeit the mwdocgen.php script does not require it.
-touch "$MW_INSTALL_PATH/LocalSettings.php"
+#
+# Explicitly use Zend PHP cli (/usr/bin/php5)
+# HHVM has a large bytecode cache overhead which does not play nice when
+# invoking mwdoc-filter.php thousands of time (bug 73311).
+echo -e "<?php\n\$wgPhpCli = '/usr/bin/php5';" >
"$MW_INSTALL_PATH/LocalSettings.php"
# Run the MediaWiki documentation wrapper
#
--
To view, visit https://gerrit.wikimedia.org/r/172756
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I48b62c9213faab2f114c41922484def8d90f9426
Gerrit-PatchSet: 3
Gerrit-Project: integration/jenkins
Gerrit-Branch: master
Gerrit-Owner: Hashar <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: Krinkle <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
