From: Aaron Schulz <aschulz@wikimedia.org>
Date: Thu, 13 Nov 2014 21:01:25 +0000 (-0800)
Subject: Avoid sending spammy @X xhprof entries over UDP
X-Git-Tag: 1.31.0-rc.0~13300
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22suivi_revisions%22%2C%22id_auteur=%24connecte%22%29%20.%20%22?a=commitdiff_plain;h=7d3fca19ef65cca520e3e76685ae9eff85e7ed75;p=lhc%2Fweb%2Fwiklou.git

Avoid sending spammy @X xhprof entries over UDP

Change-Id: I8509932f7368cab2a5426f437845e2849a82d9b4
---

diff --git a/includes/profiler/ProfilerXhprof.php b/includes/profiler/ProfilerXhprof.php
index 1e83e27c47..5e70aa9e81 100644
--- a/includes/profiler/ProfilerXhprof.php
+++ b/includes/profiler/ProfilerXhprof.php
@@ -284,6 +284,9 @@ class ProfilerXhprof extends Profiler {
 		$buffer = '';
 		$bufferSize = 0;
 		foreach ( $metrics as $func => $data ) {
+			if ( strpos( $func, '@' ) !== false ) {
+				continue; // ignore cyclic re-entries to functions
+			}
 			$line = sprintf( $wgUDPProfilerFormatString,
 				$this->getProfileID(),
 				$data['ct'],