From: Tim Starling <tstarling@users.mediawiki.org>
Date: Tue, 20 Sep 2011 01:28:08 +0000 (+0000)
Subject: Don't call Profiler::collateData() from ProfilerSimpleUDP, it destroys $this->mCollat... 
X-Git-Tag: 1.31.0-rc.0~27541
X-Git-Url: http://git.cyclocoop.org/%24image?a=commitdiff_plain;h=806756e4b5cd94e281f0ee84a37e556b753ce945;p=lhc%2Fweb%2Fwiklou.git

Don't call Profiler::collateData() from ProfilerSimpleUDP, it destroys $this->mCollated which was filled by profileOut(), leading to a profile with only overhead entries. Call Profiler::close() instead, like what ProfilerSimpleText does.
---

diff --git a/includes/profiler/ProfilerSimpleUDP.php b/includes/profiler/ProfilerSimpleUDP.php
index 6985de142d..ae607aa6ea 100644
--- a/includes/profiler/ProfilerSimpleUDP.php
+++ b/includes/profiler/ProfilerSimpleUDP.php
@@ -13,7 +13,7 @@ class ProfilerSimpleUDP extends ProfilerSimple {
 	public function logData() {
 		global $wgUDPProfilerHost, $wgUDPProfilerPort;
 
-		$this->collateData();
+		$this->close();
 
 		if ( isset( $this->mCollated['-total'] ) && $this->mCollated['-total']['real'] < $this->mMinimumTime ) {
 			# Less than minimum, ignore