From: Aaron Schulz <aschulz@wikimedia.org>
Date: Tue, 2 Apr 2013 17:22:17 +0000 (-0700)
Subject: Batch all StatCounter stats into one datagram in flush().
X-Git-Tag: 1.31.0-rc.0~20056
X-Git-Url: http://git.cyclocoop.org/%22.%24h.%22?a=commitdiff_plain;h=37ad5d6a10c0df6e1257c79302cf4275d66709e6;p=lhc%2Fweb%2Fwiklou.git

Batch all StatCounter stats into one datagram in flush().

Change-Id: I50a2cd24764e0a284c4a1138f8424ebf3990792e
---

diff --git a/includes/StatCounter.php b/includes/StatCounter.php
index ca327931d9..23a4e2bf18 100644
--- a/includes/StatCounter.php
+++ b/includes/StatCounter.php
@@ -40,6 +40,9 @@ class StatCounter {
 
 	protected function __construct() {}
 
+	/**
+	 * @return StatCounter
+	 */
 	public static function singleton() {
 		static $instance = null;
 		if ( !$instance ) {
@@ -56,13 +59,10 @@ class StatCounter {
 	 * @return void
 	 */
 	public function incr( $key, $count = 1 ) {
+		$this->deltas[$key] = isset( $this->deltas[$key] ) ? $this->deltas[$key] : 0;
+		$this->deltas[$key] += $count;
 		if ( PHP_SAPI === 'cli' ) {
-			$this->sendDelta( $key, $count );
-		} else {
-			if ( !isset( $this->deltas[$key] ) ) {
-				$this->deltas[$key] = 0;
-			}
-			$this->deltas[$key] += $count;
+			$this->flush();
 		}
 	}
 
@@ -72,66 +72,70 @@ class StatCounter {
 	 * @return void
 	 */
 	public function flush() {
-		try {
-			foreach ( $this->deltas as $key => $count ) {
-				$this->sendDelta( $key, $count );
-			}
-		} catch ( MWException $e ) {
-			trigger_error( "Caught exception: {$e->getMessage()}");
+		global $wgStatsMethod;
+
+		$deltas = array_filter( $this->deltas ); // remove 0 valued entries
+		if ( $wgStatsMethod === 'udp' ) {
+			$this->sendDeltasUDP( $deltas );
+		} elseif ( $wgStatsMethod === 'cache' ) {
+			$this->sendDeltasMemc( $deltas );
+		} else {
+			// disabled
 		}
 		$this->deltas = array();
 	}
 
-	/**
-	 * @param string $key
-	 * @param string $count
-	 * @return void
-	 */
-	protected function sendDelta( $key, $count ) {
-		global $wgStatsMethod;
-
-		$count = intval( $count );
-		if ( $count == 0 ) {
-			return;
-		}
+	protected function sendDeltasUDP( array $deltas ) {
+		global $wgUDPProfilerHost, $wgUDPProfilerPort, $wgAggregateStatsID;
 
-		if ( $wgStatsMethod == 'udp' ) {
-			global $wgUDPProfilerHost, $wgUDPProfilerPort, $wgAggregateStatsID;
-			static $socket;
+		$id = strlen( $wgAggregateStatsID ) ? $wgAggregateStatsID : wfWikiID();
 
-			$id = $wgAggregateStatsID !== false ? $wgAggregateStatsID : wfWikiID();
+		$lines = array();
+		foreach ( $deltas as $key => $count ) {
+			$lines[] = "stats/{$id} - {$count} 1 1 1 1 {$key}\n";
+		}
 
+		if ( count( $lines ) ) {
+			static $socket = null;
 			if ( !$socket ) {
 				$socket = socket_create( AF_INET, SOCK_DGRAM, SOL_UDP );
-				$statline = "stats/{$id} - 1 1 1 1 1 -total\n";
+				array_unshift( $lines, "stats/{$id} - 1 1 1 1 1 -total\n" );
+			}
+			$packet = '';
+			$packets = array();
+			foreach ( $lines as $line ) {
+				if ( ( strlen( $packet ) + strlen( $line ) ) > 1450 ) {
+					$packets[] = $packet;
+					$packet = '';
+				}
+				$packet .= $line;
+			}
+			if ( $packet != '' ) {
+				$packets[] = $packet;
+			}
+			foreach ( $packets as $packet ) {
+				wfSuppressWarnings();
 				socket_sendto(
 					$socket,
-					$statline,
-					strlen( $statline ),
+					$packet,
+					strlen( $packet ),
 					0,
 					$wgUDPProfilerHost,
 					$wgUDPProfilerPort
 				);
+				wfRestoreWarnings();
 			}
-			$statline = "stats/{$id} - {$count} 1 1 1 1 {$key}\n";
-			wfSuppressWarnings();
-			socket_sendto(
-				$socket,
-				$statline,
-				strlen( $statline ),
-				0,
-				$wgUDPProfilerHost,
-				$wgUDPProfilerPort
-			);
-			wfRestoreWarnings();
-		} elseif ( $wgStatsMethod == 'cache' ) {
-			global $wgMemc;
-			$key = wfMemcKey( 'stats', $key );
-			if ( is_null( $wgMemc->incr( $key, $count ) ) ) {
-				$wgMemc->add( $key, $count );
+		}
+	}
+
+	protected function sendDeltasMemc( array $deltas ) {
+		global $wgMemc;
+
+		foreach ( $deltas as $key => $count ) {
+			$ckey = wfMemcKey( 'stats', $key );
+			if ( $wgMemc->incr( $ckey, $count ) === null ) {
+				$wgMemc->add( $ckey, $count );
 			}
-		} else {
-			// Disabled
 		}
 	}
 }