jenkins-bot has submitted this change and it was merged.
Change subject: Remove per-template profiling
......................................................................
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
---
M includes/profiler/Profiler.php
M includes/profiler/ProfilerSimpleDB.php
M includes/profiler/ProfilerSimpleUDP.php
M includes/profiler/ProfilerStandard.php
M includes/profiler/ProfilerStub.php
M includes/profiler/ProfilerXhprof.php
6 files changed, 0 insertions(+), 39 deletions(-)
Approvals:
Aaron Schulz: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/profiler/Profiler.php b/includes/profiler/Profiler.php
index 380d80f..078b66b 100644
--- a/includes/profiler/Profiler.php
+++ b/includes/profiler/Profiler.php
@@ -81,18 +81,6 @@
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
*/
public function setProfileID( $id ) {
diff --git a/includes/profiler/ProfilerSimpleDB.php
b/includes/profiler/ProfilerSimpleDB.php
index 3625db6..911b926 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 2671376..ad16a18 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 d75ae9e..b873806 100644
--- a/includes/profiler/ProfilerStandard.php
+++ b/includes/profiler/ProfilerStandard.php
@@ -67,16 +67,6 @@
}
/**
- * Return whether this profiler stores data
- *
- * @see Profiler::logData()
- * @return bool
- */
- public function isPersistent() {
- return false;
- }
-
- /**
* Add the inital item in the stack.
*/
protected function addInitialStack() {
diff --git a/includes/profiler/ProfilerStub.php
b/includes/profiler/ProfilerStub.php
index e81f579..43e2193 100644
--- a/includes/profiler/ProfilerStub.php
+++ b/includes/profiler/ProfilerStub.php
@@ -31,10 +31,6 @@
return true;
}
- public function isPersistent() {
- return false;
- }
-
public function profileIn( $fn ) {
}
diff --git a/includes/profiler/ProfilerXhprof.php
b/includes/profiler/ProfilerXhprof.php
index acfe7e0..1e83e27 100644
--- a/includes/profiler/ProfilerXhprof.php
+++ b/includes/profiler/ProfilerXhprof.php
@@ -127,11 +127,6 @@
return false;
}
- public function isPersistent() {
- // Disable per-title profiling sections
- return true;
- }
-
/**
* No-op for xhprof profiling.
*
--
To view, visit https://gerrit.wikimedia.org/r/170239
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3c780fcb06e3470a0cbf50311ba916a0b67ea49e
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Chad <[email protected]>
Gerrit-Reviewer: Aaron Schulz <[email protected]>
Gerrit-Reviewer: BryanDavis <[email protected]>
Gerrit-Reviewer: Chad <[email protected]>
Gerrit-Reviewer: Cscott <[email protected]>
Gerrit-Reviewer: Jackmcbarn <[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
