jenkins-bot has submitted this change and it was merged.
Change subject: Remove $wgRUstart, unused
......................................................................
Remove $wgRUstart, unused
Change-Id: Ia57f8fb2da4eed6b185ea0592d521e3119411f0e
---
M includes/WebStart.php
M includes/profiler/SectionProfiler.php
2 files changed, 2 insertions(+), 4 deletions(-)
Approvals:
Aaron Schulz: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/WebStart.php b/includes/WebStart.php
index 9c71f3e..f97dc6a 100644
--- a/includes/WebStart.php
+++ b/includes/WebStart.php
@@ -78,7 +78,6 @@
# Grab profiling functions
require_once "$IP/includes/profiler/ProfilerFunctions.php";
-$wgRUstart = wfGetRusage() ?: array();
# Start the autoloader, so that extensions can derive classes from core files
require_once "$IP/includes/AutoLoader.php";
diff --git a/includes/profiler/SectionProfiler.php
b/includes/profiler/SectionProfiler.php
index 245022d..bab8eba 100644
--- a/includes/profiler/SectionProfiler.php
+++ b/includes/profiler/SectionProfiler.php
@@ -451,15 +451,14 @@
}
/**
- * Get the initial time of the request, based either on $wgRequestTime
or
- * $wgRUstart. Will return null if not able to find data.
+ * Get the initial time of the request, based on getrusage()
*
* @param string|bool $metric Metric to use, with the following
possibilities:
* - user: User CPU time (without system calls)
* - cpu: Total CPU time (user and system calls)
* - wall (or any other string): elapsed time
* - false (default): will fall back to default metric
- * @return float|null
+ * @return float
*/
protected function getTime( $metric = 'wall' ) {
if ( $metric === 'cpu' || $metric === 'user' ) {
--
To view, visit https://gerrit.wikimedia.org/r/204650
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia57f8fb2da4eed6b185ea0592d521e3119411f0e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Chad <[email protected]>
Gerrit-Reviewer: Aaron Schulz <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
