Move initial setting of $extNode out of the conditional

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

diff --git a/includes/profiler/ProfilerSimple.php b/includes/profiler/ProfilerSimple.php
index b59c528..ee92c17 100644 (file)
--- a/includes/profiler/ProfilerSimple.php
+++ b/includes/profiler/ProfilerSimple.php
@@ -29,17 +29,44 @@
 class ProfilerSimple extends Profiler {
        var $mMinimumTime = 0;
 
-       var $zeroEntry = array( 'cpu' => 0.0, 'cpu_sq' => 0.0, 'real' => 0.0, 'real_sq' => 0.0, 'count' => 0 );
        var $errorEntry;
 
+       public function getZeroEntry() {
+               return array(
+                       'cpu'     => 0.0,
+                       'cpu_sq'  => 0.0,
+                       'real'    => 0.0,
+                       'real_sq' => 0.0,
+                       'count'   => 0
+               );
+       }
+
+       public function getErrorEntry() {
+               $entry = $this->getZeroEntry();
+               $entry['count'] = 1;
+               return $entry;
+       }
+
+       public function updateEntry( $name, $elapsedCpu, $elapsedReal ) {
+               $entry =& $this->mCollated[$name];
+               if ( !is_array( $entry ) ) {
+                       $entry = $this->getZeroEntry();
+                       $this->mCollated[$name] =& $entry;
+               }
+               $entry['cpu'] += $elapsedCpu;
+               $entry['cpu_sq'] += $elapsedCpu * $elapsedCpu;
+               $entry['real'] += $elapsedReal;
+               $entry['real_sq'] += $elapsedReal * $elapsedReal;
+               $entry['count']++;
+       }
+
        public function isPersistent() {
                /* Implement in output subclasses */
                return false;
        }
 
        protected function addInitialStack() {
-               $this->errorEntry = $this->zeroEntry;
-               $this->errorEntry['count'] = 1;
+               $this->errorEntry = $this->getErrorEntry();
 
                $initialTime = $this->getInitialTime();
                $initialCpu = $this->getInitialTime( 'cpu' );
@@ -88,19 +115,10 @@ class ProfilerSimple extends Profiler {
                                $this->debug( "$message\n" );
                                $this->mCollated[$message] = $this->errorEntry;
                        }
-                       $entry =& $this->mCollated[$functionname];
                        $elapsedcpu = $this->getTime( 'cpu' ) - $octime;
                        $elapsedreal = $this->getTime() - $ortime;
-                       if ( !is_array( $entry ) ) {
-                               $entry = $this->zeroEntry;
-                               $this->mCollated[$functionname] =& $entry;
-                       }
-                       $entry['cpu'] += $elapsedcpu;
-                       $entry['cpu_sq'] += $elapsedcpu * $elapsedcpu;
-                       $entry['real'] += $elapsedreal;
-                       $entry['real_sq'] += $elapsedreal * $elapsedreal;
-                       $entry['count']++;
-
+                       $this->updateEntry( $functionname, $elapsedcpu, $elapsedreal );
+                       $this->updateTrxProfiling( $functionname, $elapsedreal );
                }
        }
 
@@ -112,21 +130,4 @@ class ProfilerSimple extends Profiler {
        public function logData() {
                /* Implement in subclasses */
        }
-
-       /**
-        * Get the actual CPU time or the initial one if $ru is set.
-        *
-        * @deprecated in 1.20
-        * @return float|null
-        */
-       function getCpuTime( $ru = null ) {
-               wfDeprecated( __METHOD__, '1.20' );
-
-               if ( $ru === null ) {
-                       return $this->getTime( 'cpu' );
-               } else {
-                       # It theory we should use $ru here, but it always $wgRUstart that is passed here
-                       return $this->getInitialTime( 'cpu' );
-               }
-       }
 }