From c1f9b1f7b1b77776192048005dcc66dcf3df2bfb Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Sat, 27 Dec 2014 15:41:37 +0100
Subject: Update to MediaWiki 1.24.1

---
 includes/profiler/ProfilerSimple.php | 133 -----------------------------------
 1 file changed, 133 deletions(-)
 delete mode 100644 includes/profiler/ProfilerSimple.php

(limited to 'includes/profiler/ProfilerSimple.php')

diff --git a/includes/profiler/ProfilerSimple.php b/includes/profiler/ProfilerSimple.php
deleted file mode 100644
index 805c60f4..00000000
--- a/includes/profiler/ProfilerSimple.php
+++ /dev/null
@@ -1,133 +0,0 @@
-<?php
-/**
- * Base class for simple profiling.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- * http://www.gnu.org/copyleft/gpl.html
- *
- * @file
- * @ingroup Profiler
- */
-
-/**
- * Simple profiler base class.
- * @todo document methods (?)
- * @ingroup Profiler
- */
-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 isPersistent() {
-		/* Implement in output subclasses */
-		return false;
-	}
-
-	protected function addInitialStack() {
-		$this->errorEntry = $this->zeroEntry;
-		$this->errorEntry['count'] = 1;
-
-		$initialTime = $this->getInitialTime();
-		$initialCpu = $this->getInitialTime( 'cpu' );
-		if ( $initialTime !== null && $initialCpu !== null ) {
-			$this->mWorkStack[] = array( '-total', 0, $initialTime, $initialCpu );
-			$this->mWorkStack[] = array( '-setup', 1, $initialTime, $initialCpu );
-
-			$this->profileOut( '-setup' );
-		} else {
-			$this->profileIn( '-total' );
-		}
-	}
-
-	function setMinimum( $min ) {
-		$this->mMinimumTime = $min;
-	}
-
-	function profileIn( $functionname ) {
-		global $wgDebugFunctionEntry;
-		if ( $wgDebugFunctionEntry ) {
-			$this->debug( str_repeat( ' ', count( $this->mWorkStack ) ) . 'Entering ' . $functionname . "\n" );
-		}
-		$this->mWorkStack[] = array( $functionname, count( $this->mWorkStack ), $this->getTime(), $this->getTime( 'cpu' ) );
-	}
-
-	function profileOut( $functionname ) {
-		global $wgDebugFunctionEntry;
-
-		if ( $wgDebugFunctionEntry ) {
-			$this->debug( str_repeat( ' ', count( $this->mWorkStack ) - 1 ) . 'Exiting ' . $functionname . "\n" );
-		}
-
-		list( $ofname, /* $ocount */, $ortime, $octime ) = array_pop( $this->mWorkStack );
-
-		if ( !$ofname ) {
-			$this->debug( "Profiling error: $functionname\n" );
-		} else {
-			if ( $functionname == 'close' ) {
-				$message = "Profile section ended by close(): {$ofname}";
-				$functionname = $ofname;
-				$this->debug( "$message\n" );
-				$this->mCollated[$message] = $this->errorEntry;
-			}
-			elseif ( $ofname != $functionname ) {
-				$message = "Profiling error: in({$ofname}), out($functionname)";
-				$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->updateTrxProfiling( $functionname, $elapsedreal );
-		}
-	}
-
-	public function getFunctionReport() {
-		/* Implement in output subclasses */
-		return '';
-	}
-
-	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' );
-		}
-	}
-}
-- 
cgit v1.2.2