Added more Setup.php profiling

Change-Id: Ie76c1ae54ccf825f387b57a8e9096f608eb3d120

diff --git a/includes/Setup.php b/includes/Setup.php
index f75ee29..eef5ccb 100644 (file)
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -36,6 +36,7 @@ if ( !defined( 'MEDIAWIKI' ) ) {
 
 $fname = 'Setup.php';
 wfProfileIn( $fname );
+wfProfileIn( $fname  . '-defaults' );
 
 // Check to see if we are at the file scope
 if ( !isset( $wgVersion ) ) {
@@ -248,8 +249,10 @@ foreach ( $wgForeignFileRepos as &$repo ) {
 unset( $repo ); // no global pollution; destroy reference
 
 if ( is_null( $wgEnableAutoRotation ) ) {
+       wfProfileIn( $fname . '-defaults-rotation' );
        // Only enable auto-rotation when the bitmap handler can rotate
        $wgEnableAutoRotation = BitmapHandler::canRotate();
+       wfProfileOut( $fname . '-defaults-rotation' );
 }
 
 if ( $wgRCFilterByAge ) {
@@ -401,11 +404,15 @@ if ( $wgRC2UDPAddress ) {
        );
 }
 
+wfProfileOut( $fname  . '-defaults' );
+
 // Disable MWDebug for command line mode, this prevents MWDebug from eating up
 // all the memory from logging SQL queries on maintenance scripts
 global $wgCommandLineMode;
 if ( $wgDebugToolbar && !$wgCommandLineMode ) {
+       wfProfileIn( $fname . '-debugtoolbar' );
        MWDebug::init();
+       wfProfileOut( $fname . '-debugtoolbar' );
 }
 
 if ( !class_exists( 'AutoLoader' ) ) {
@@ -423,6 +430,7 @@ require_once "$IP/includes/ProxyTools.php";
 require_once "$IP/includes/normal/UtfNormalDefines.php";
 wfProfileOut( $fname . '-includes' );
 
+wfProfileIn( $fname . '-defaults2' );
 if ( $wgSecureLogin && substr( $wgServer, 0, 2 ) !== '//' ) {
        $wgSecureLogin = false;
        wfWarn( 'Secure login was enabled on a server that only supports HTTP or HTTPS. Disabling secure login.' );
@@ -431,7 +439,9 @@ if ( $wgSecureLogin && substr( $wgServer, 0, 2 ) !== '//' ) {
 # Now that GlobalFunctions is loaded, set defaults that depend
 # on it.
 if ( $wgTmpDirectory === false ) {
+       wfProfileIn( $fname . '-tempDir' );
        $wgTmpDirectory = wfTempDir();
+       wfProfileOut( $fname . '-tempDir' );
 }
 
 if ( $wgCanonicalServer === false ) {
@@ -455,6 +465,7 @@ if ( !$wgHTCPRouting && $wgHTCPMulticastAddress ) {
        );
 }
 
+wfProfileOut( $fname . '-defaults2' );
 wfProfileIn( $fname . '-misc1' );
 
 # Raise the memory limit if it's too low