From: Aaron Schulz <aschulz@wikimedia.org>
Date: Wed, 10 Jun 2015 20:32:51 +0000 (-0700)
Subject: Avoid section profiling in Hooks::run due to high overhead
X-Git-Tag: 1.31.0-rc.0~11121
X-Git-Url: http://git.cyclocoop.org/%24self?a=commitdiff_plain;h=0e298302d4eb0b46b894a12f3093ae62f2ff865d;p=lhc%2Fweb%2Fwiklou.git

Avoid section profiling in Hooks::run due to high overhead

* This wastes 60-70ms and is not really needed with flame graphs anyway

Change-Id: Ifc20ee6fb6439128195b025c652fa29c6f9fc25e
---

diff --git a/includes/Hooks.php b/includes/Hooks.php
index dffc7bcfe8..036d65c71e 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -135,9 +135,6 @@ class Hooks {
 	 *   returning null) is equivalent to returning true.
 	 */
 	public static function run( $event, array $args = array(), $deprecatedVersion = null ) {
-		$profiler = Profiler::instance();
-		$eventPS = $profiler->scopedProfileIn( 'hook: ' . $event );
-
 		foreach ( self::getHandlers( $event ) as $hook ) {
 			// Turn non-array values into an array. (Can't use casting because of objects.)
 			if ( !is_array( $hook ) ) {
@@ -196,8 +193,6 @@ class Hooks {
 			$badhookmsg = null;
 			$hook_args = array_merge( $hook, $args );
 
-			// Profile first in case the Profiler causes errors
-			$funcPS = $profiler->scopedProfileIn( $func );
 			set_error_handler( 'Hooks::hookErrorHandler' );
 
 			// mark hook as deprecated, if deprecation version is specified
@@ -215,7 +210,6 @@ class Hooks {
 			}
 
 			restore_error_handler();
-			$profiler->scopedProfileOut( $funcPS );
 
 			// Process the return value.
 			if ( is_string( $retval ) ) {