From: Chad Horohoe <chadh@wikimedia.org>
Date: Thu, 30 Oct 2014 22:45:24 +0000 (-0700)
Subject: Remove per-template profiling
X-Git-Tag: 1.31.0-rc.0~13317
X-Git-Url: http://git.cyclocoop.org/%24image?a=commitdiff_plain;h=4fa6c46c945b101ea69b855c8ea22a3e59655385;p=lhc%2Fweb%2Fwiklou.git

Remove per-template profiling

Creates absurd dependency on the profiler from the parser. This profiling
is also not compatible with function-level profiling that we're trying to
aim for with xhprof.

Change-Id: I3c780fcb06e3470a0cbf50311ba916a0b67ea49e
---

diff --git a/includes/profiler/Profiler.php b/includes/profiler/Profiler.php
index 380d80fddc..078b66bdc2 100644
--- a/includes/profiler/Profiler.php
+++ b/includes/profiler/Profiler.php
@@ -80,18 +80,6 @@ abstract class Profiler {
 	 */
 	abstract public function isStub();
 
-	/**
-	 * Return whether this profiler stores data
-	 *
-	 * Called by Parser::braceSubstitution. If true, the parser will not
-	 * generate per-title profiling sections, to avoid overloading the
-	 * profiling data collector.
-	 *
-	 * @see Profiler::logData()
-	 * @return bool
-	 */
-	abstract public function isPersistent();
-
 	/**
 	 * @param string $id
 	 */
diff --git a/includes/profiler/ProfilerSimpleDB.php b/includes/profiler/ProfilerSimpleDB.php
index 3625db630d..911b926a7a 100644
--- a/includes/profiler/ProfilerSimpleDB.php
+++ b/includes/profiler/ProfilerSimpleDB.php
@@ -27,10 +27,6 @@
  * @ingroup Profiler
  */
 class ProfilerSimpleDB extends ProfilerStandard {
-	public function isPersistent() {
-		return true;
-	}
-
 	/**
 	 * Log the whole profiling data into the database.
 	 */
diff --git a/includes/profiler/ProfilerSimpleUDP.php b/includes/profiler/ProfilerSimpleUDP.php
index 2671376a69..ad16a18ed8 100644
--- a/includes/profiler/ProfilerSimpleUDP.php
+++ b/includes/profiler/ProfilerSimpleUDP.php
@@ -28,10 +28,6 @@
  * @ingroup Profiler
  */
 class ProfilerSimpleUDP extends ProfilerStandard {
-	public function isPersistent() {
-		return true;
-	}
-
 	public function logData() {
 		global $wgUDPProfilerHost, $wgUDPProfilerPort, $wgUDPProfilerFormatString;
 
diff --git a/includes/profiler/ProfilerStandard.php b/includes/profiler/ProfilerStandard.php
index d75ae9e3c4..b873806ab8 100644
--- a/includes/profiler/ProfilerStandard.php
+++ b/includes/profiler/ProfilerStandard.php
@@ -66,16 +66,6 @@ class ProfilerStandard extends Profiler {
 		return false;
 	}
 
-	/**
-	 * Return whether this profiler stores data
-	 *
-	 * @see Profiler::logData()
-	 * @return bool
-	 */
-	public function isPersistent() {
-		return false;
-	}
-
 	/**
 	 * Add the inital item in the stack.
 	 */
diff --git a/includes/profiler/ProfilerStub.php b/includes/profiler/ProfilerStub.php
index e81f579ad5..43e219387f 100644
--- a/includes/profiler/ProfilerStub.php
+++ b/includes/profiler/ProfilerStub.php
@@ -31,10 +31,6 @@ class ProfilerStub extends Profiler {
 		return true;
 	}
 
-	public function isPersistent() {
-		return false;
-	}
-
 	public function profileIn( $fn ) {
 	}
 
diff --git a/includes/profiler/ProfilerXhprof.php b/includes/profiler/ProfilerXhprof.php
index acfe7e0b7f..1e83e27c47 100644
--- a/includes/profiler/ProfilerXhprof.php
+++ b/includes/profiler/ProfilerXhprof.php
@@ -127,11 +127,6 @@ class ProfilerXhprof extends Profiler {
 		return false;
 	}
 
-	public function isPersistent() {
-		// Disable per-title profiling sections
-		return true;
-	}
-
 	/**
 	 * No-op for xhprof profiling.
 	 *