From 3041806e4d08b37058bd9b3f1abb04bd0482136c Mon Sep 17 00:00:00 2001 From: Domas Mituzas Date: Sun, 13 Apr 2008 16:46:22 +0000 Subject: [PATCH] added one profiling point, fixed some profiling blocks --- includes/LoadBalancer.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) 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; } -- 2.20.1