Merge "Added VirtualRESTServiceClient/VirtualRESTService classes"

[lhc/web/wiklou.git] / includes / profiler / Profiler.php

diff --git a/includes/profiler/Profiler.php b/includes/profiler/Profiler.php
index 8c819ff..b709498 100644 (file)
--- a/includes/profiler/Profiler.php
+++ b/includes/profiler/Profiler.php
@@ -259,7 +259,7 @@ abstract class Profiler {
         * Get the initial time of the request, based either on $wgRequestTime or
         * $wgRUstart. Will return null if not able to find data.
         *
-        * @param string|false $metric Metric to use, with the following possibilities:
+        * @param string|bool $metric Metric to use, with the following possibilities:
         *   - user: User CPU time (without system calls)
         *   - cpu: Total CPU time (user and system calls)
         *   - wall (or any other string): elapsed time
@@ -288,7 +288,7 @@ abstract class Profiler {
         * Get the initial time of the request, based either on $wgRequestTime or
         * $wgRUstart. Will return null if not able to find data.
         *
-        * @param string|false $metric Metric to use, with the following possibilities:
+        * @param string|bool $metric Metric to use, with the following possibilities:
         *   - user: User CPU time (without system calls)
         *   - cpu: Total CPU time (user and system calls)
         *   - wall (or any other string): elapsed time
@@ -354,9 +354,9 @@ abstract class Profiler {
 class TransactionProfiler {
        /** @var float seconds */
        protected $mDBLockThreshold = 5.0;
-       /** @var Array DB/server name => (active trx count,timestamp) */
+       /** @var array DB/server name => (active trx count,timestamp) */
        protected $mDBTrxHoldingLocks = array();
-       /** @var Array DB/server name => list of (function name, elapsed time) */
+       /** @var array DB/server name => list of (function name, elapsed time) */
        protected $mDBTrxMethodTimes = array();
 
        /**
@@ -431,7 +431,7 @@ class TransactionProfiler {
                                        list( $method, $realtime ) = $info;
                                        $msg .= sprintf( "%d\t%.6f\t%s\n", $i, $realtime, $method );
                                }
-                               $this->debugGroup( 'DBPerformance', $msg );
+                               wfDebugLog( 'DBPerformance', $msg );
                        }
                        unset( $this->mDBTrxHoldingLocks[$name] );
                        unset( $this->mDBTrxMethodTimes[$name] );