From: Domas Mituzas <midom@users.mediawiki.org>
Date: Sun, 13 Apr 2008 16:46:22 +0000 (+0000)
Subject: added one profiling point, fixed some profiling blocks
X-Git-Tag: 1.31.0-rc.0~48369
X-Git-Url: http://git.cyclocoop.org/%22.%28%24lien.?a=commitdiff_plain;h=3041806e4d08b37058bd9b3f1abb04bd0482136c;p=lhc%2Fweb%2Fwiklou.git

added one profiling point, fixed some profiling blocks
---

diff --git a/includes/LoadBalancer.php b/includes/LoadBalancer.php
index fab42aae03..e3caab6bec 100644
--- a/includes/LoadBalancer.php
+++ b/includes/LoadBalancer.php
@@ -471,9 +471,10 @@ class LoadBalancer {
 	 */
 	function openConnection( $i, $wiki = false ) {
 		wfProfileIn( __METHOD__ );
-
 		if ( $wiki !== false ) {
-			return $this->openForeignConnection( $i, $wiki );
+			$conn = $this->openForeignConnection( $i, $wiki );
+			wfProfileOut( __METHOD__);
+			return $conn;
 		}
 		if ( isset( $this->mConns['local'][$i][0] ) ) {
 			$conn = $this->mConns['local'][$i][0];
@@ -513,8 +514,8 @@ class LoadBalancer {
 	 * @return Database
 	 */
 	function openForeignConnection( $i, $wiki ) {
+		wfProfileIn(__METHOD__);
 		list( $dbName, $prefix ) = wfSplitWikiID( $wiki );
-
 		if ( isset( $this->mConns['foreignUsed'][$i][$wiki] ) ) {
 			// Reuse an already-used connection
 			$conn = $this->mConns['foreignUsed'][$i][$wiki];
@@ -563,6 +564,7 @@ class LoadBalancer {
 			$refCount = $conn->getLBInfo( 'foreignPoolRefCount' );
 			$conn->setLBInfo( 'foreignPoolRefCount', $refCount + 1 );
 		}
+		wfProfileOut(__METHOD__);
 		return $conn;
 	}