From: Sam Reed <reedy@users.mediawiki.org>
Date: Sun, 17 Oct 2010 19:04:05 +0000 (+0000)
Subject: Move profiler stuff to own folder, updater AutoLoader to match
X-Git-Tag: 1.31.0-rc.0~34461
X-Git-Url: http://git.cyclocoop.org///%22%40url%40//%22?a=commitdiff_plain;h=47b13d184cbc11a1893a59fb2bfd07da5acd80b6;p=lhc%2Fweb%2Fwiklou.git

Move profiler stuff to own folder, updater AutoLoader to match

ProfilerSimpleTrace isn't in AutoLoader. Neither is ProfilerStub

Profiler also says " * This file is only included if profiling is enabled"...
---

diff --git a/includes/AutoLoader.php b/includes/AutoLoader.php
index 07b4fff8fb..41a95c3eb6 100644
--- a/includes/AutoLoader.php
+++ b/includes/AutoLoader.php
@@ -183,10 +183,10 @@ $wgAutoloadLocalClasses = array(
 	'PoolCounterWork' => 'includes/PoolCounter.php',
 	'Preferences' => 'includes/Preferences.php',
 	'PrefixSearch' => 'includes/PrefixSearch.php',
-	'Profiler' => 'includes/Profiler.php',
-	'ProfilerSimple' => 'includes/ProfilerSimple.php',
-	'ProfilerSimpleText' => 'includes/ProfilerSimpleText.php',
-	'ProfilerSimpleUDP' => 'includes/ProfilerSimpleUDP.php',
+	'Profiler' => 'includes/profiler/Profiler.php',
+	'ProfilerSimple' => 'includes/profiler/ProfilerSimple.php',
+	'ProfilerSimpleText' => 'includes/profiler/ProfilerSimpleText.php',
+	'ProfilerSimpleUDP' => 'includes/profiler/ProfilerSimpleUDP.php',
 	'ProtectionForm' => 'includes/ProtectionForm.php',
 	'QueryPage' => 'includes/QueryPage.php',
 	'QuickTemplate' => 'includes/SkinTemplate.php',
diff --git a/includes/Profiler.php b/includes/Profiler.php
deleted file mode 100644
index 6deb742e26..0000000000
--- a/includes/Profiler.php
+++ /dev/null
@@ -1,463 +0,0 @@
-<?php
-/**
- * @defgroup Profiler Profiler
- *
- * @file
- * @ingroup Profiler
- * This file is only included if profiling is enabled
- */
-
-/** backward compatibility */
-$wgProfiling = true;
-
-/**
- * Begin profiling of a function
- * @param $functionname String: name of the function we will profile
- */
-function wfProfileIn( $functionname ) {
-	global $wgProfiler;
-	$wgProfiler->profileIn( $functionname );
-}
-
-/**
- * Stop profiling of a function
- * @param $functionname String: name of the function we have profiled
- */
-function wfProfileOut( $functionname = 'missing' ) {
-	global $wgProfiler;
-	$wgProfiler->profileOut( $functionname );
-}
-
-/**
- * Returns a profiling output to be stored in debug file
- *
- * @param $start Float
- * @param $elapsed Float: time elapsed since the beginning of the request
- */
-function wfGetProfilingOutput( $start, $elapsed ) {
-	global $wgProfiler;
-	return $wgProfiler->getOutput( $start, $elapsed );
-}
-
-/**
- * Close opened profiling sections
- */
-function wfProfileClose() {
-	global $wgProfiler;
-	$wgProfiler->close();
-}
-
-if (!function_exists('memory_get_usage')) {
-	# Old PHP or --enable-memory-limit not compiled in
-	function memory_get_usage() {
-		return 0;
-	}
-}
-
-/**
- * @ingroup Profiler
- * @todo document
- */
-class Profiler {
-	var $mStack = array (), $mWorkStack = array (), $mCollated = array ();
-	var $mCalls = array (), $mTotals = array ();
-	var $mTemplated = false;
-
-	function __construct() {
-		// Push an entry for the pre-profile setup time onto the stack
-		global $wgRequestTime;
-		if ( !empty( $wgRequestTime ) ) {
-			$this->mWorkStack[] = array( '-total', 0, $wgRequestTime, 0 );
-			$this->mStack[] = array( '-setup', 1, $wgRequestTime, 0, microtime(true), 0 );
-		} else {
-			$this->profileIn( '-total' );
-		}
-	}
-
-	/**
-	 * Called by wfProfieIn()
-	 *
-	 * @param $functionname String
-	 */
-	function profileIn( $functionname ) {
-		global $wgDebugFunctionEntry, $wgProfiling;
-		if( !$wgProfiling ) return;
-		if( $wgDebugFunctionEntry ){
-			$this->debug( str_repeat( ' ', count( $this->mWorkStack ) ) . 'Entering ' . $functionname . "\n" );
-		}
-
-		$this->mWorkStack[] = array( $functionname, count( $this->mWorkStack ), $this->getTime(), memory_get_usage() );
-	}
-
-	/**
-	 * Called by wfProfieOut()
-	 *
-	 * @param $functionname String
-	 */
-	function profileOut($functionname) {
-		global $wgDebugFunctionEntry, $wgProfiling;
-		if( !$wgProfiling ) return;
-		$memory = memory_get_usage();
-		$time = $this->getTime();
-
-		if( $wgDebugFunctionEntry ){
-			$this->debug( str_repeat( ' ', count( $this->mWorkStack ) - 1 ) . 'Exiting ' . $functionname . "\n" );
-		}
-
-		$bit = array_pop($this->mWorkStack);
-
-		if (!$bit) {
-			$this->debug("Profiling error, !\$bit: $functionname\n");
-		} else {
-			//if( $wgDebugProfiling ){
-				if( $functionname == 'close' ){
-					$message = "Profile section ended by close(): {$bit[0]}";
-					$this->debug( "$message\n" );
-					$this->mStack[] = array( $message, 0, '0 0', 0, '0 0', 0 );
-				}
-				elseif( $bit[0] != $functionname ){
-					$message = "Profiling error: in({$bit[0]}), out($functionname)";
-					$this->debug( "$message\n" );
-					$this->mStack[] = array( $message, 0, '0 0', 0, '0 0', 0 );
-				}
-			//}
-			$bit[] = $time;
-			$bit[] = $memory;
-			$this->mStack[] = $bit;
-		}
-	}
-
-	/**
-	 * called by wfProfileClose()
-	 */
-	function close() {
-		global $wgProfiling;
-
-		# Avoid infinite loop
-		if( !$wgProfiling )
-			return;
-
-		while( count( $this->mWorkStack ) ){
-			$this->profileOut( 'close' );
-		}
-	}
-
-	/**
-	 * Mark this call as templated or not
-	 *
-	 * @param $t Boolean
-	 */
-	function setTemplated( $t ) {
-		$this->mTemplated = $t;
-	}
-
-	/**
-	 * Called by wfGetProfilingOutput()
-	 */
-	function getOutput() {
-		global $wgDebugFunctionEntry, $wgProfileCallTree;
-		$wgDebugFunctionEntry = false;
-
-		if( !count( $this->mStack ) && !count( $this->mCollated ) ){
-			return "No profiling output\n";
-		}
-		$this->close();
-
-		if( $wgProfileCallTree ) {
-			global $wgProfileToDatabase;
-			# XXX: We must call $this->getFunctionReport() to log to the DB
-			if( $wgProfileToDatabase ) {
-				$this->getFunctionReport();
-			}
-			return $this->getCallTree();
-		} else {
-			return $this->getFunctionReport();
-		}
-	}
-
-	/**
-	 * Returns a tree of function call instead of a list of functions
-	 */
-	function getCallTree() {
-		return implode( '', array_map( array( &$this, 'getCallTreeLine' ), $this->remapCallTree( $this->mStack ) ) );
-	}
-
-	/**
-	 * Recursive function the format the current profiling array into a tree
-	 *
-	 * @param $stack profiling array
-	 */
-	function remapCallTree( $stack ) {
-		if( count( $stack ) < 2 ){
-			return $stack;
-		}
-		$outputs = array ();
-		for( $max = count( $stack ) - 1; $max > 0; ){
-			/* Find all items under this entry */
-			$level = $stack[$max][1];
-			$working = array ();
-			for( $i = $max -1; $i >= 0; $i-- ){
-				if( $stack[$i][1] > $level ){
-					$working[] = $stack[$i];
-				} else {
-					break;
-				}
-			}
-			$working = $this->remapCallTree( array_reverse( $working ) );
-			$output = array();
-			foreach( $working as $item ){
-				array_push( $output, $item );
-			}
-			array_unshift( $output, $stack[$max] );
-			$max = $i;
-
-			array_unshift( $outputs, $output );
-		}
-		$final = array();
-		foreach( $outputs as $output ){
-			foreach( $output as $item ){
-				$final[] = $item;
-			}
-		}
-		return $final;
-	}
-
-	/**
-	 * Callback to get a formatted line for the call tree
-	 */
-	function getCallTreeLine( $entry ) {
-		list( $fname, $level, $start, /* $x */, $end)  = $entry;
-		$delta = $end - $start;
-		$space = str_repeat(' ', $level);
-		# The ugly double sprintf is to work around a PHP bug,
-		# which has been fixed in recent releases.
-		return sprintf( "%10s %s %s\n", trim( sprintf( "%7.3f", $delta * 1000.0 ) ), $space, $fname );
-	}
-
-	function getTime() {
-		return microtime(true);
-		#return $this->getUserTime();
-	}
-
-	function getUserTime() {
-		$ru = getrusage();
-		return $ru['ru_utime.tv_sec'].' '.$ru['ru_utime.tv_usec'] / 1e6;
-	}
-
-	/**
-	 * Returns a list of profiled functions.
-	 * Also log it into the database if $wgProfileToDatabase is set to true.
-	 */
-	function getFunctionReport() {
-		global $wgProfileToDatabase;
-
-		$width = 140;
-		$nameWidth = $width - 65;
-		$format =      "%-{$nameWidth}s %6d %13.3f %13.3f %13.3f%% %9d  (%13.3f -%13.3f) [%d]\n";
-		$titleFormat = "%-{$nameWidth}s %6s %13s %13s %13s %9s\n";
-		$prof = "\nProfiling data\n";
-		$prof .= sprintf( $titleFormat, 'Name', 'Calls', 'Total', 'Each', '%', 'Mem' );
-		$this->mCollated = array ();
-		$this->mCalls = array ();
-		$this->mMemory = array ();
-
-		# Estimate profiling overhead
-		$profileCount = count($this->mStack);
-		wfProfileIn( '-overhead-total' );
-		for( $i = 0; $i < $profileCount; $i ++ ){
-			wfProfileIn( '-overhead-internal' );
-			wfProfileOut( '-overhead-internal' );
-		}
-		wfProfileOut( '-overhead-total' );
-
-		# First, subtract the overhead!
-		$overheadTotal = $overheadMemory = $overheadInternal = array();
-		foreach( $this->mStack as $entry ){
-			$fname = $entry[0];
-			$start = $entry[2];
-			$end = $entry[4];
-			$elapsed = $end - $start;
-			$memory = $entry[5] - $entry[3];
-
-			if( $fname == '-overhead-total' ){
-				$overheadTotal[] = $elapsed;
-				$overheadMemory[] = $memory;
-			}
-			elseif( $fname == '-overhead-internal' ){
-				$overheadInternal[] = $elapsed;
-			}
-		}
-		$overheadTotal = $overheadTotal ? array_sum( $overheadTotal ) / count( $overheadInternal ) : 0;
-		$overheadMemory = $overheadMemory ? array_sum( $overheadMemory ) / count( $overheadInternal ) : 0;
-		$overheadInternal = $overheadInternal ? array_sum( $overheadInternal ) / count( $overheadInternal ) : 0;
-
-		# Collate
-		foreach( $this->mStack as $index => $entry ){
-			$fname = $entry[0];
-			$start = $entry[2];
-			$end = $entry[4];
-			$elapsed = $end - $start;
-
-			$memory = $entry[5] - $entry[3];
-			$subcalls = $this->calltreeCount( $this->mStack, $index );
-
-			if( !preg_match( '/^-overhead/', $fname ) ){
-				# Adjust for profiling overhead (except special values with elapsed=0
-				if( $elapsed ) {
-					$elapsed -= $overheadInternal;
-					$elapsed -= ($subcalls * $overheadTotal);
-					$memory -= ($subcalls * $overheadMemory);
-				}
-			}
-
-			if( !array_key_exists( $fname, $this->mCollated ) ){
-				$this->mCollated[$fname] = 0;
-				$this->mCalls[$fname] = 0;
-				$this->mMemory[$fname] = 0;
-				$this->mMin[$fname] = 1 << 24;
-				$this->mMax[$fname] = 0;
-				$this->mOverhead[$fname] = 0;
-			}
-
-			$this->mCollated[$fname] += $elapsed;
-			$this->mCalls[$fname]++;
-			$this->mMemory[$fname] += $memory;
-			$this->mMin[$fname] = min($this->mMin[$fname], $elapsed);
-			$this->mMax[$fname] = max($this->mMax[$fname], $elapsed);
-			$this->mOverhead[$fname] += $subcalls;
-		}
-
-		$total = @$this->mCollated['-total'];
-		$this->mCalls['-overhead-total'] = $profileCount;
-
-		# Output
-		arsort( $this->mCollated, SORT_NUMERIC );
-		foreach( $this->mCollated as $fname => $elapsed ){
-			$calls = $this->mCalls[$fname];
-			$percent = $total ? 100. * $elapsed / $total : 0;
-			$memory = $this->mMemory[$fname];
-			$prof .= sprintf($format, substr($fname, 0, $nameWidth), $calls, (float) ($elapsed * 1000), (float) ($elapsed * 1000) / $calls, $percent, $memory, ($this->mMin[$fname] * 1000.0), ($this->mMax[$fname] * 1000.0), $this->mOverhead[$fname]);
-			# Log to the DB
-			if( $wgProfileToDatabase ) {
-				self::logToDB($fname, (float) ($elapsed * 1000), $calls, (float) ($memory) );
-			}
-		}
-		$prof .= "\nTotal: $total\n\n";
-
-		return $prof;
-	}
-
-	/**
-	 * Counts the number of profiled function calls sitting under
-	 * the given point in the call graph. Not the most efficient algo.
-	 *
-	 * @param $stack Array:
-	 * @param $start Integer:
-	 * @return Integer
-	 * @private
-	 */
-	function calltreeCount($stack, $start) {
-		$level = $stack[$start][1];
-		$count = 0;
-		for ($i = $start -1; $i >= 0 && $stack[$i][1] > $level; $i --) {
-			$count ++;
-		}
-		return $count;
-	}
-
-	/**
-	 * Log a function into the database.
-	 *
-	 * @param $name String: function name
-	 * @param $timeSum Float
-	 * @param $eventCount Integer: number of times that function was called
-	 * @param $memorySum Integer: memory used by the function
-	 */
-	static function logToDB( $name, $timeSum, $eventCount, $memorySum ){
-		# Do not log anything if database is readonly (bug 5375)
-		if( wfReadOnly() ) { return; }
-
-		global $wgProfilePerHost;
-
-		$dbw = wfGetDB( DB_MASTER );
-		if( !is_object( $dbw ) )
-			return false;
-		$errorState = $dbw->ignoreErrors( true );
-
-		$name = substr($name, 0, 255);
-
-		if( $wgProfilePerHost ){
-			$pfhost = wfHostname();
-		} else {
-			$pfhost = '';
-		}
-		
-		// Kludge
-		$timeSum = ($timeSum >= 0) ? $timeSum : 0;
-		$memorySum = ($memorySum >= 0) ? $memorySum : 0;
-
-		$dbw->update( 'profiling',
-			array(
-				"pf_count=pf_count+{$eventCount}",
-				"pf_time=pf_time+{$timeSum}",
-				"pf_memory=pf_memory+{$memorySum}",
-			),
-			array(
-				'pf_name' => $name,
-				'pf_server' => $pfhost,
-			),
-			__METHOD__ );
-				
-
-		$rc = $dbw->affectedRows();
-		if ($rc == 0) {
-			$dbw->insert('profiling', array ('pf_name' => $name, 'pf_count' => $eventCount,
-				'pf_time' => $timeSum, 'pf_memory' => $memorySum, 'pf_server' => $pfhost ), 
-				__METHOD__, array ('IGNORE'));
-		}
-		// When we upgrade to mysql 4.1, the insert+update
-		// can be merged into just a insert with this construct added:
-		//     "ON DUPLICATE KEY UPDATE ".
-		//     "pf_count=pf_count + VALUES(pf_count), ".
-		//     "pf_time=pf_time + VALUES(pf_time)";
-		$dbw->ignoreErrors( $errorState );
-	}
-
-	/**
-	 * Get the function name of the current profiling section
-	 */
-	function getCurrentSection() {
-		$elt = end( $this->mWorkStack );
-		return $elt[0];
-	}
-
-	/**
-	 * Get function caller
-	 *
-	 * @param $level Integer
-	 */
-	static function getCaller( $level ) {
-		$backtrace = wfDebugBacktrace();
-		if ( isset( $backtrace[$level] ) ) {
-			if ( isset( $backtrace[$level]['class'] ) ) {
-				$caller = $backtrace[$level]['class'] . '::' . $backtrace[$level]['function'];
-			} else {
-				$caller = $backtrace[$level]['function'];
-			}
-		} else {
-			$caller = 'unknown';
-		}
-		return $caller;
-	}
-
-	/**
-	 * Add an entry in the debug log file
-	 *
-	 * @param $s String to output
-	 */
-	function debug( $s ) {
-		if( function_exists( 'wfDebug' ) ) {
-			wfDebug( $s );
-		}
-	}
-}
diff --git a/includes/ProfilerSimple.php b/includes/ProfilerSimple.php
deleted file mode 100644
index 8aab1ecc32..0000000000
--- a/includes/ProfilerSimple.php
+++ /dev/null
@@ -1,130 +0,0 @@
-<?php
-/**
- * @file
- * @ingroup Profiler
- */
-
-if ( !class_exists( 'Profiler' ) ) {
-	require_once(dirname(__FILE__).'/Profiler.php');
-}
-
-/**
- * Simple profiler base class.
- * @todo document methods (?)
- * @ingroup Profiler
- */
-class ProfilerSimple extends Profiler {
-	var $mMinimumTime = 0;
-	var $mProfileID = false;
-
-	function __construct() {
-		global $wgRequestTime, $wgRUstart;
-		if (!empty($wgRequestTime) && !empty($wgRUstart)) {
-			$this->mWorkStack[] = array( '-total', 0, $wgRequestTime,$this->getCpuTime($wgRUstart));
-
-			$elapsedcpu = $this->getCpuTime() - $this->getCpuTime($wgRUstart);
-			$elapsedreal = microtime(true) - $wgRequestTime;
-
-			$entry =& $this->mCollated["-setup"];
-			if (!is_array($entry)) {
-				$entry = array('cpu'=> 0.0, 'cpu_sq' => 0.0, 'real' => 0.0, 'real_sq' => 0.0, 'count' => 0);
-				$this->mCollated["-setup"] =& $entry;
-			}
-			$entry['cpu'] += $elapsedcpu;
-			$entry['cpu_sq'] += $elapsedcpu*$elapsedcpu;
-			$entry['real'] += $elapsedreal;
-			$entry['real_sq'] += $elapsedreal*$elapsedreal;
-			$entry['count']++;
-		}
-	}
-
-	function setMinimum( $min ) {
-		$this->mMinimumTime = $min;
-	}
-
-	function setProfileID( $id ) {
-		$this->mProfileID = $id;
-	}
-
-	function getProfileID() {
-		if ( $this->mProfileID === false ) {
-			return wfWikiID();
-		} else {
-			return $this->mProfileID;
-		}
-	}
-
-	function profileIn($functionname) {
-		global $wgDebugFunctionEntry;
-		if ($wgDebugFunctionEntry) {
-			$this->debug(str_repeat(' ', count($this->mWorkStack)).'Entering '.$functionname."\n");
-		}
-		$this->mWorkStack[] = array($functionname, count( $this->mWorkStack ), microtime(true), $this->getCpuTime());
-	}
-
-	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] = array(
-					'real' => 0.0, 'count' => 1);
-			}
-			elseif ($ofname != $functionname) {
-				$message = "Profiling error: in({$ofname}), out($functionname)";
-				$this->debug( "$message\n" );
-				$this->mCollated[$message] = array(
-					'real' => 0.0, 'count' => 1);
-			}
-			$entry =& $this->mCollated[$functionname];
-			$elapsedcpu = $this->getCpuTime() - $octime;
-			$elapsedreal = microtime(true) - $ortime;
-			if (!is_array($entry)) {
-				$entry = array('cpu'=> 0.0, 'cpu_sq' => 0.0, 'real' => 0.0, 'real_sq' => 0.0, 'count' => 0);
-				$this->mCollated[$functionname] =& $entry;
-			}
-			$entry['cpu'] += $elapsedcpu;
-			$entry['cpu_sq'] += $elapsedcpu*$elapsedcpu;
-			$entry['real'] += $elapsedreal;
-			$entry['real_sq'] += $elapsedreal*$elapsedreal;
-			$entry['count']++;
-
-		}
-	}
-
-	function getFunctionReport() {
-		/* Implement in output subclasses */
-	}
-
-	function getCpuTime($ru=null) {
-		if ( function_exists( 'getrusage' ) ) {
-			if ( $ru == null ) {
-				$ru = getrusage();
-			}
-			return ($ru['ru_utime.tv_sec'] + $ru['ru_stime.tv_sec'] + ($ru['ru_utime.tv_usec'] +
-				$ru['ru_stime.tv_usec']) * 1e-6);
-		} else {
-			return 0;
-		}
-	}
-
-	/* If argument is passed, it assumes that it is dual-format time string, returns proper float time value */
-	function getTime($time=null) {
-		if ($time==null) {
-			return microtime(true);
-		}
-		list($a,$b)=explode(" ",$time);
-		return (float)($a+$b);
-	}
-}
diff --git a/includes/ProfilerSimpleText.php b/includes/ProfilerSimpleText.php
deleted file mode 100644
index db4b6053c2..0000000000
--- a/includes/ProfilerSimpleText.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
- * @file
- * @ingroup Profiler
- */
-
-require_once( dirname( __FILE__ ) . '/ProfilerSimple.php' );
-
-/**
- * The least sophisticated profiler output class possible, view your source! :)
- *
- * Put the following 3 lines in StartProfiler.php:
- *
- * require_once( dirname( __FILE__ ) . '/includes/ProfilerSimpleText.php' );
- * $wgProfiler = new ProfilerSimpleText;
- * $wgProfiler->visible=true;
- *
- * @ingroup Profiler
- */
-class ProfilerSimpleText extends ProfilerSimple {
-	public $visible=false; /* Show as <PRE> or <!-- ? */
-	static private $out;
-
-	function getFunctionReport() {
-		if($this->mTemplated) {
-			uasort($this->mCollated,array('self','sort'));
-			array_walk($this->mCollated,array('self','format'));
-			if ($this->visible) {
-				print '<pre>'.self::$out.'</pre>';
-			} else {
-				print "<!--\n".self::$out."\n-->\n";
-			}
-		}
-	}
-
-	/* dense is good */
-	static function sort($a,$b) { return $a['real']<$b['real']; /* sort descending by time elapsed */ }
-	static function format($item,$key) { self::$out .= sprintf("%3.6f %6d - %s\n",$item['real'],$item['count'], $key); }
-}
diff --git a/includes/ProfilerSimpleTrace.php b/includes/ProfilerSimpleTrace.php
deleted file mode 100644
index 8d1a0d81ba..0000000000
--- a/includes/ProfilerSimpleTrace.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-/**
- * @file
- * @ingroup Profiler
- */
-
-if ( !class_exists( 'ProfilerSimple' ) ) {
-	require_once(dirname(__FILE__).'/ProfilerSimple.php');
-}
-
-/**
- * Execution trace
- * @todo document methods (?)
- * @ingroup Profiler
- */
-class ProfilerSimpleTrace extends ProfilerSimple {
-	var $mMinimumTime = 0;
-	var $mProfileID = false;
-	var $trace = "";
-	var $memory = 0;
-
-	function __construct() {
-		global $wgRequestTime, $wgRUstart;
-		if (!empty($wgRequestTime) && !empty($wgRUstart)) {
-			$this->mWorkStack[] = array( '-total', 0, $wgRequestTime,$this->getCpuTime($wgRUstart));
-			$elapsedcpu = $this->getCpuTime() - $this->getCpuTime($wgRUstart);
-			$elapsedreal = microtime(true) - $wgRequestTime;
-		}
-		$this->trace .= "Beginning trace: \n";
-	}
-
-	function profileIn($functionname) {
-		$this->mWorkStack[] = array($functionname, count( $this->mWorkStack ), microtime(true), $this->getCpuTime());
-		$this->trace .= "         " . sprintf("%6.1f",$this->memoryDiff()) . str_repeat( " ", count($this->mWorkStack)) . " > " . $functionname . "\n";
-	}
-
-	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->trace .= "Profiling error: $functionname\n";
-		} else {
-			if ($functionname == 'close') {
-				$message = "Profile section ended by close(): {$ofname}";
-				$functionname = $ofname;
-				$this->trace .= $message . "\n";
-			}
-			elseif ($ofname != $functionname) {
-				$this->trace .= "Profiling error: in({$ofname}), out($functionname)";
-			}
-			$elapsedcpu = $this->getCpuTime() - $octime;
-			$elapsedreal = microtime(true) - $ortime;
-			$this->trace .= sprintf("%03.6f %6.1f",$elapsedreal,$this->memoryDiff()) .  str_repeat(" ",count($this->mWorkStack)+1) . " < " . $functionname . "\n";
-		}
-	}
-	
-	function memoryDiff() {
-		$diff = memory_get_usage() - $this->memory;
-		$this->memory = memory_get_usage();
-		return $diff/1024;
-	}
-
-	function getOutput() {
-		print "<!-- \n {$this->trace} \n -->";
-	}
-}
diff --git a/includes/ProfilerSimpleUDP.php b/includes/ProfilerSimpleUDP.php
deleted file mode 100644
index 67ad97f654..0000000000
--- a/includes/ProfilerSimpleUDP.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-/**
- * @file
- * @ingroup Profiler
- */
-
-require_once(dirname(__FILE__).'/ProfilerSimple.php');
-
-/**
- * ProfilerSimpleUDP class, that sends out messages for 'udpprofile' daemon
- * (the one from mediawiki/trunk/udpprofile SVN )
- * @ingroup Profiler
- */
-class ProfilerSimpleUDP extends ProfilerSimple {
-	function getFunctionReport() {
-		global $wgUDPProfilerHost, $wgUDPProfilerPort;
-
-		if ( $this->mCollated['-total']['real'] < $this->mMinimumTime ) {
-			# Less than minimum, ignore
-			return;
-		}
-
-		$sock = socket_create(AF_INET, SOCK_DGRAM, SOL_UDP);
-		$plength=0;
-		$packet="";
-		foreach ($this->mCollated as $entry=>$pfdata) {
-			$pfline=sprintf ("%s %s %d %f %f %f %f %s\n", $this->getProfileID(),"-",$pfdata['count'],
-				$pfdata['cpu'],$pfdata['cpu_sq'],$pfdata['real'],$pfdata['real_sq'],$entry);
-			$length=strlen($pfline);
-			/* printf("<!-- $pfline -->"); */
-			if ($length+$plength>1400) {
-				socket_sendto($sock,$packet,$plength,0,$wgUDPProfilerHost,$wgUDPProfilerPort);
-				$packet="";
-				$plength=0;
-			}
-			$packet.=$pfline;
-			$plength+=$length;
-		}
-		socket_sendto($sock,$packet,$plength,0x100,$wgUDPProfilerHost,$wgUDPProfilerPort);
-	}
-}
diff --git a/includes/ProfilerStub.php b/includes/ProfilerStub.php
deleted file mode 100644
index e624e6f019..0000000000
--- a/includes/ProfilerStub.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-/**
- * Stub profiling functions
- * @file
- * @ingroup Profiler
- */
-
-/** backward compatibility */
-$wgProfiling = false;
-$wgProfiler = null;
-
-/** is setproctitle function available ? */
-$haveProctitle = function_exists( 'setproctitle' );
-
-/**
- * Begin profiling of a function
- * @param $fn string
- */
-function wfProfileIn( $fn = '' ) {
-	global $hackwhere, $wgDBname, $haveProctitle;
-	if( $haveProctitle ){
-		$hackwhere[] = $fn;
-		setproctitle( $fn . " [$wgDBname]" );
-	}
-}
-
-/**
- * Stop profiling of a function
- * @param $fn string
- */
-function wfProfileOut( $fn = '' ) {
-	global $hackwhere, $wgDBname, $haveProctitle;
-	if( !$haveProctitle ) {
-		return;
-	}
-	if( count( $hackwhere ) ) {
-		array_pop( $hackwhere );
-	}
-	if( count( $hackwhere ) ) {
-		setproctitle( $hackwhere[count( $hackwhere )-1] . " [$wgDBname]" );
-	}
-}
-
-/**
- * Does nothing, just for compatibility 
- */
-function wfGetProfilingOutput( $s, $e ) {}
-
-/**
- * Does nothing, just for compatibility 
- */
-function wfProfileClose() {}
diff --git a/includes/profiler/Profiler.php b/includes/profiler/Profiler.php
new file mode 100644
index 0000000000..6deb742e26
--- /dev/null
+++ b/includes/profiler/Profiler.php
@@ -0,0 +1,463 @@
+<?php
+/**
+ * @defgroup Profiler Profiler
+ *
+ * @file
+ * @ingroup Profiler
+ * This file is only included if profiling is enabled
+ */
+
+/** backward compatibility */
+$wgProfiling = true;
+
+/**
+ * Begin profiling of a function
+ * @param $functionname String: name of the function we will profile
+ */
+function wfProfileIn( $functionname ) {
+	global $wgProfiler;
+	$wgProfiler->profileIn( $functionname );
+}
+
+/**
+ * Stop profiling of a function
+ * @param $functionname String: name of the function we have profiled
+ */
+function wfProfileOut( $functionname = 'missing' ) {
+	global $wgProfiler;
+	$wgProfiler->profileOut( $functionname );
+}
+
+/**
+ * Returns a profiling output to be stored in debug file
+ *
+ * @param $start Float
+ * @param $elapsed Float: time elapsed since the beginning of the request
+ */
+function wfGetProfilingOutput( $start, $elapsed ) {
+	global $wgProfiler;
+	return $wgProfiler->getOutput( $start, $elapsed );
+}
+
+/**
+ * Close opened profiling sections
+ */
+function wfProfileClose() {
+	global $wgProfiler;
+	$wgProfiler->close();
+}
+
+if (!function_exists('memory_get_usage')) {
+	# Old PHP or --enable-memory-limit not compiled in
+	function memory_get_usage() {
+		return 0;
+	}
+}
+
+/**
+ * @ingroup Profiler
+ * @todo document
+ */
+class Profiler {
+	var $mStack = array (), $mWorkStack = array (), $mCollated = array ();
+	var $mCalls = array (), $mTotals = array ();
+	var $mTemplated = false;
+
+	function __construct() {
+		// Push an entry for the pre-profile setup time onto the stack
+		global $wgRequestTime;
+		if ( !empty( $wgRequestTime ) ) {
+			$this->mWorkStack[] = array( '-total', 0, $wgRequestTime, 0 );
+			$this->mStack[] = array( '-setup', 1, $wgRequestTime, 0, microtime(true), 0 );
+		} else {
+			$this->profileIn( '-total' );
+		}
+	}
+
+	/**
+	 * Called by wfProfieIn()
+	 *
+	 * @param $functionname String
+	 */
+	function profileIn( $functionname ) {
+		global $wgDebugFunctionEntry, $wgProfiling;
+		if( !$wgProfiling ) return;
+		if( $wgDebugFunctionEntry ){
+			$this->debug( str_repeat( ' ', count( $this->mWorkStack ) ) . 'Entering ' . $functionname . "\n" );
+		}
+
+		$this->mWorkStack[] = array( $functionname, count( $this->mWorkStack ), $this->getTime(), memory_get_usage() );
+	}
+
+	/**
+	 * Called by wfProfieOut()
+	 *
+	 * @param $functionname String
+	 */
+	function profileOut($functionname) {
+		global $wgDebugFunctionEntry, $wgProfiling;
+		if( !$wgProfiling ) return;
+		$memory = memory_get_usage();
+		$time = $this->getTime();
+
+		if( $wgDebugFunctionEntry ){
+			$this->debug( str_repeat( ' ', count( $this->mWorkStack ) - 1 ) . 'Exiting ' . $functionname . "\n" );
+		}
+
+		$bit = array_pop($this->mWorkStack);
+
+		if (!$bit) {
+			$this->debug("Profiling error, !\$bit: $functionname\n");
+		} else {
+			//if( $wgDebugProfiling ){
+				if( $functionname == 'close' ){
+					$message = "Profile section ended by close(): {$bit[0]}";
+					$this->debug( "$message\n" );
+					$this->mStack[] = array( $message, 0, '0 0', 0, '0 0', 0 );
+				}
+				elseif( $bit[0] != $functionname ){
+					$message = "Profiling error: in({$bit[0]}), out($functionname)";
+					$this->debug( "$message\n" );
+					$this->mStack[] = array( $message, 0, '0 0', 0, '0 0', 0 );
+				}
+			//}
+			$bit[] = $time;
+			$bit[] = $memory;
+			$this->mStack[] = $bit;
+		}
+	}
+
+	/**
+	 * called by wfProfileClose()
+	 */
+	function close() {
+		global $wgProfiling;
+
+		# Avoid infinite loop
+		if( !$wgProfiling )
+			return;
+
+		while( count( $this->mWorkStack ) ){
+			$this->profileOut( 'close' );
+		}
+	}
+
+	/**
+	 * Mark this call as templated or not
+	 *
+	 * @param $t Boolean
+	 */
+	function setTemplated( $t ) {
+		$this->mTemplated = $t;
+	}
+
+	/**
+	 * Called by wfGetProfilingOutput()
+	 */
+	function getOutput() {
+		global $wgDebugFunctionEntry, $wgProfileCallTree;
+		$wgDebugFunctionEntry = false;
+
+		if( !count( $this->mStack ) && !count( $this->mCollated ) ){
+			return "No profiling output\n";
+		}
+		$this->close();
+
+		if( $wgProfileCallTree ) {
+			global $wgProfileToDatabase;
+			# XXX: We must call $this->getFunctionReport() to log to the DB
+			if( $wgProfileToDatabase ) {
+				$this->getFunctionReport();
+			}
+			return $this->getCallTree();
+		} else {
+			return $this->getFunctionReport();
+		}
+	}
+
+	/**
+	 * Returns a tree of function call instead of a list of functions
+	 */
+	function getCallTree() {
+		return implode( '', array_map( array( &$this, 'getCallTreeLine' ), $this->remapCallTree( $this->mStack ) ) );
+	}
+
+	/**
+	 * Recursive function the format the current profiling array into a tree
+	 *
+	 * @param $stack profiling array
+	 */
+	function remapCallTree( $stack ) {
+		if( count( $stack ) < 2 ){
+			return $stack;
+		}
+		$outputs = array ();
+		for( $max = count( $stack ) - 1; $max > 0; ){
+			/* Find all items under this entry */
+			$level = $stack[$max][1];
+			$working = array ();
+			for( $i = $max -1; $i >= 0; $i-- ){
+				if( $stack[$i][1] > $level ){
+					$working[] = $stack[$i];
+				} else {
+					break;
+				}
+			}
+			$working = $this->remapCallTree( array_reverse( $working ) );
+			$output = array();
+			foreach( $working as $item ){
+				array_push( $output, $item );
+			}
+			array_unshift( $output, $stack[$max] );
+			$max = $i;
+
+			array_unshift( $outputs, $output );
+		}
+		$final = array();
+		foreach( $outputs as $output ){
+			foreach( $output as $item ){
+				$final[] = $item;
+			}
+		}
+		return $final;
+	}
+
+	/**
+	 * Callback to get a formatted line for the call tree
+	 */
+	function getCallTreeLine( $entry ) {
+		list( $fname, $level, $start, /* $x */, $end)  = $entry;
+		$delta = $end - $start;
+		$space = str_repeat(' ', $level);
+		# The ugly double sprintf is to work around a PHP bug,
+		# which has been fixed in recent releases.
+		return sprintf( "%10s %s %s\n", trim( sprintf( "%7.3f", $delta * 1000.0 ) ), $space, $fname );
+	}
+
+	function getTime() {
+		return microtime(true);
+		#return $this->getUserTime();
+	}
+
+	function getUserTime() {
+		$ru = getrusage();
+		return $ru['ru_utime.tv_sec'].' '.$ru['ru_utime.tv_usec'] / 1e6;
+	}
+
+	/**
+	 * Returns a list of profiled functions.
+	 * Also log it into the database if $wgProfileToDatabase is set to true.
+	 */
+	function getFunctionReport() {
+		global $wgProfileToDatabase;
+
+		$width = 140;
+		$nameWidth = $width - 65;
+		$format =      "%-{$nameWidth}s %6d %13.3f %13.3f %13.3f%% %9d  (%13.3f -%13.3f) [%d]\n";
+		$titleFormat = "%-{$nameWidth}s %6s %13s %13s %13s %9s\n";
+		$prof = "\nProfiling data\n";
+		$prof .= sprintf( $titleFormat, 'Name', 'Calls', 'Total', 'Each', '%', 'Mem' );
+		$this->mCollated = array ();
+		$this->mCalls = array ();
+		$this->mMemory = array ();
+
+		# Estimate profiling overhead
+		$profileCount = count($this->mStack);
+		wfProfileIn( '-overhead-total' );
+		for( $i = 0; $i < $profileCount; $i ++ ){
+			wfProfileIn( '-overhead-internal' );
+			wfProfileOut( '-overhead-internal' );
+		}
+		wfProfileOut( '-overhead-total' );
+
+		# First, subtract the overhead!
+		$overheadTotal = $overheadMemory = $overheadInternal = array();
+		foreach( $this->mStack as $entry ){
+			$fname = $entry[0];
+			$start = $entry[2];
+			$end = $entry[4];
+			$elapsed = $end - $start;
+			$memory = $entry[5] - $entry[3];
+
+			if( $fname == '-overhead-total' ){
+				$overheadTotal[] = $elapsed;
+				$overheadMemory[] = $memory;
+			}
+			elseif( $fname == '-overhead-internal' ){
+				$overheadInternal[] = $elapsed;
+			}
+		}
+		$overheadTotal = $overheadTotal ? array_sum( $overheadTotal ) / count( $overheadInternal ) : 0;
+		$overheadMemory = $overheadMemory ? array_sum( $overheadMemory ) / count( $overheadInternal ) : 0;
+		$overheadInternal = $overheadInternal ? array_sum( $overheadInternal ) / count( $overheadInternal ) : 0;
+
+		# Collate
+		foreach( $this->mStack as $index => $entry ){
+			$fname = $entry[0];
+			$start = $entry[2];
+			$end = $entry[4];
+			$elapsed = $end - $start;
+
+			$memory = $entry[5] - $entry[3];
+			$subcalls = $this->calltreeCount( $this->mStack, $index );
+
+			if( !preg_match( '/^-overhead/', $fname ) ){
+				# Adjust for profiling overhead (except special values with elapsed=0
+				if( $elapsed ) {
+					$elapsed -= $overheadInternal;
+					$elapsed -= ($subcalls * $overheadTotal);
+					$memory -= ($subcalls * $overheadMemory);
+				}
+			}
+
+			if( !array_key_exists( $fname, $this->mCollated ) ){
+				$this->mCollated[$fname] = 0;
+				$this->mCalls[$fname] = 0;
+				$this->mMemory[$fname] = 0;
+				$this->mMin[$fname] = 1 << 24;
+				$this->mMax[$fname] = 0;
+				$this->mOverhead[$fname] = 0;
+			}
+
+			$this->mCollated[$fname] += $elapsed;
+			$this->mCalls[$fname]++;
+			$this->mMemory[$fname] += $memory;
+			$this->mMin[$fname] = min($this->mMin[$fname], $elapsed);
+			$this->mMax[$fname] = max($this->mMax[$fname], $elapsed);
+			$this->mOverhead[$fname] += $subcalls;
+		}
+
+		$total = @$this->mCollated['-total'];
+		$this->mCalls['-overhead-total'] = $profileCount;
+
+		# Output
+		arsort( $this->mCollated, SORT_NUMERIC );
+		foreach( $this->mCollated as $fname => $elapsed ){
+			$calls = $this->mCalls[$fname];
+			$percent = $total ? 100. * $elapsed / $total : 0;
+			$memory = $this->mMemory[$fname];
+			$prof .= sprintf($format, substr($fname, 0, $nameWidth), $calls, (float) ($elapsed * 1000), (float) ($elapsed * 1000) / $calls, $percent, $memory, ($this->mMin[$fname] * 1000.0), ($this->mMax[$fname] * 1000.0), $this->mOverhead[$fname]);
+			# Log to the DB
+			if( $wgProfileToDatabase ) {
+				self::logToDB($fname, (float) ($elapsed * 1000), $calls, (float) ($memory) );
+			}
+		}
+		$prof .= "\nTotal: $total\n\n";
+
+		return $prof;
+	}
+
+	/**
+	 * Counts the number of profiled function calls sitting under
+	 * the given point in the call graph. Not the most efficient algo.
+	 *
+	 * @param $stack Array:
+	 * @param $start Integer:
+	 * @return Integer
+	 * @private
+	 */
+	function calltreeCount($stack, $start) {
+		$level = $stack[$start][1];
+		$count = 0;
+		for ($i = $start -1; $i >= 0 && $stack[$i][1] > $level; $i --) {
+			$count ++;
+		}
+		return $count;
+	}
+
+	/**
+	 * Log a function into the database.
+	 *
+	 * @param $name String: function name
+	 * @param $timeSum Float
+	 * @param $eventCount Integer: number of times that function was called
+	 * @param $memorySum Integer: memory used by the function
+	 */
+	static function logToDB( $name, $timeSum, $eventCount, $memorySum ){
+		# Do not log anything if database is readonly (bug 5375)
+		if( wfReadOnly() ) { return; }
+
+		global $wgProfilePerHost;
+
+		$dbw = wfGetDB( DB_MASTER );
+		if( !is_object( $dbw ) )
+			return false;
+		$errorState = $dbw->ignoreErrors( true );
+
+		$name = substr($name, 0, 255);
+
+		if( $wgProfilePerHost ){
+			$pfhost = wfHostname();
+		} else {
+			$pfhost = '';
+		}
+		
+		// Kludge
+		$timeSum = ($timeSum >= 0) ? $timeSum : 0;
+		$memorySum = ($memorySum >= 0) ? $memorySum : 0;
+
+		$dbw->update( 'profiling',
+			array(
+				"pf_count=pf_count+{$eventCount}",
+				"pf_time=pf_time+{$timeSum}",
+				"pf_memory=pf_memory+{$memorySum}",
+			),
+			array(
+				'pf_name' => $name,
+				'pf_server' => $pfhost,
+			),
+			__METHOD__ );
+				
+
+		$rc = $dbw->affectedRows();
+		if ($rc == 0) {
+			$dbw->insert('profiling', array ('pf_name' => $name, 'pf_count' => $eventCount,
+				'pf_time' => $timeSum, 'pf_memory' => $memorySum, 'pf_server' => $pfhost ), 
+				__METHOD__, array ('IGNORE'));
+		}
+		// When we upgrade to mysql 4.1, the insert+update
+		// can be merged into just a insert with this construct added:
+		//     "ON DUPLICATE KEY UPDATE ".
+		//     "pf_count=pf_count + VALUES(pf_count), ".
+		//     "pf_time=pf_time + VALUES(pf_time)";
+		$dbw->ignoreErrors( $errorState );
+	}
+
+	/**
+	 * Get the function name of the current profiling section
+	 */
+	function getCurrentSection() {
+		$elt = end( $this->mWorkStack );
+		return $elt[0];
+	}
+
+	/**
+	 * Get function caller
+	 *
+	 * @param $level Integer
+	 */
+	static function getCaller( $level ) {
+		$backtrace = wfDebugBacktrace();
+		if ( isset( $backtrace[$level] ) ) {
+			if ( isset( $backtrace[$level]['class'] ) ) {
+				$caller = $backtrace[$level]['class'] . '::' . $backtrace[$level]['function'];
+			} else {
+				$caller = $backtrace[$level]['function'];
+			}
+		} else {
+			$caller = 'unknown';
+		}
+		return $caller;
+	}
+
+	/**
+	 * Add an entry in the debug log file
+	 *
+	 * @param $s String to output
+	 */
+	function debug( $s ) {
+		if( function_exists( 'wfDebug' ) ) {
+			wfDebug( $s );
+		}
+	}
+}
diff --git a/includes/profiler/ProfilerSimple.php b/includes/profiler/ProfilerSimple.php
new file mode 100644
index 0000000000..8aab1ecc32
--- /dev/null
+++ b/includes/profiler/ProfilerSimple.php
@@ -0,0 +1,130 @@
+<?php
+/**
+ * @file
+ * @ingroup Profiler
+ */
+
+if ( !class_exists( 'Profiler' ) ) {
+	require_once(dirname(__FILE__).'/Profiler.php');
+}
+
+/**
+ * Simple profiler base class.
+ * @todo document methods (?)
+ * @ingroup Profiler
+ */
+class ProfilerSimple extends Profiler {
+	var $mMinimumTime = 0;
+	var $mProfileID = false;
+
+	function __construct() {
+		global $wgRequestTime, $wgRUstart;
+		if (!empty($wgRequestTime) && !empty($wgRUstart)) {
+			$this->mWorkStack[] = array( '-total', 0, $wgRequestTime,$this->getCpuTime($wgRUstart));
+
+			$elapsedcpu = $this->getCpuTime() - $this->getCpuTime($wgRUstart);
+			$elapsedreal = microtime(true) - $wgRequestTime;
+
+			$entry =& $this->mCollated["-setup"];
+			if (!is_array($entry)) {
+				$entry = array('cpu'=> 0.0, 'cpu_sq' => 0.0, 'real' => 0.0, 'real_sq' => 0.0, 'count' => 0);
+				$this->mCollated["-setup"] =& $entry;
+			}
+			$entry['cpu'] += $elapsedcpu;
+			$entry['cpu_sq'] += $elapsedcpu*$elapsedcpu;
+			$entry['real'] += $elapsedreal;
+			$entry['real_sq'] += $elapsedreal*$elapsedreal;
+			$entry['count']++;
+		}
+	}
+
+	function setMinimum( $min ) {
+		$this->mMinimumTime = $min;
+	}
+
+	function setProfileID( $id ) {
+		$this->mProfileID = $id;
+	}
+
+	function getProfileID() {
+		if ( $this->mProfileID === false ) {
+			return wfWikiID();
+		} else {
+			return $this->mProfileID;
+		}
+	}
+
+	function profileIn($functionname) {
+		global $wgDebugFunctionEntry;
+		if ($wgDebugFunctionEntry) {
+			$this->debug(str_repeat(' ', count($this->mWorkStack)).'Entering '.$functionname."\n");
+		}
+		$this->mWorkStack[] = array($functionname, count( $this->mWorkStack ), microtime(true), $this->getCpuTime());
+	}
+
+	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] = array(
+					'real' => 0.0, 'count' => 1);
+			}
+			elseif ($ofname != $functionname) {
+				$message = "Profiling error: in({$ofname}), out($functionname)";
+				$this->debug( "$message\n" );
+				$this->mCollated[$message] = array(
+					'real' => 0.0, 'count' => 1);
+			}
+			$entry =& $this->mCollated[$functionname];
+			$elapsedcpu = $this->getCpuTime() - $octime;
+			$elapsedreal = microtime(true) - $ortime;
+			if (!is_array($entry)) {
+				$entry = array('cpu'=> 0.0, 'cpu_sq' => 0.0, 'real' => 0.0, 'real_sq' => 0.0, 'count' => 0);
+				$this->mCollated[$functionname] =& $entry;
+			}
+			$entry['cpu'] += $elapsedcpu;
+			$entry['cpu_sq'] += $elapsedcpu*$elapsedcpu;
+			$entry['real'] += $elapsedreal;
+			$entry['real_sq'] += $elapsedreal*$elapsedreal;
+			$entry['count']++;
+
+		}
+	}
+
+	function getFunctionReport() {
+		/* Implement in output subclasses */
+	}
+
+	function getCpuTime($ru=null) {
+		if ( function_exists( 'getrusage' ) ) {
+			if ( $ru == null ) {
+				$ru = getrusage();
+			}
+			return ($ru['ru_utime.tv_sec'] + $ru['ru_stime.tv_sec'] + ($ru['ru_utime.tv_usec'] +
+				$ru['ru_stime.tv_usec']) * 1e-6);
+		} else {
+			return 0;
+		}
+	}
+
+	/* If argument is passed, it assumes that it is dual-format time string, returns proper float time value */
+	function getTime($time=null) {
+		if ($time==null) {
+			return microtime(true);
+		}
+		list($a,$b)=explode(" ",$time);
+		return (float)($a+$b);
+	}
+}
diff --git a/includes/profiler/ProfilerSimpleText.php b/includes/profiler/ProfilerSimpleText.php
new file mode 100644
index 0000000000..db4b6053c2
--- /dev/null
+++ b/includes/profiler/ProfilerSimpleText.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ * @file
+ * @ingroup Profiler
+ */
+
+require_once( dirname( __FILE__ ) . '/ProfilerSimple.php' );
+
+/**
+ * The least sophisticated profiler output class possible, view your source! :)
+ *
+ * Put the following 3 lines in StartProfiler.php:
+ *
+ * require_once( dirname( __FILE__ ) . '/includes/ProfilerSimpleText.php' );
+ * $wgProfiler = new ProfilerSimpleText;
+ * $wgProfiler->visible=true;
+ *
+ * @ingroup Profiler
+ */
+class ProfilerSimpleText extends ProfilerSimple {
+	public $visible=false; /* Show as <PRE> or <!-- ? */
+	static private $out;
+
+	function getFunctionReport() {
+		if($this->mTemplated) {
+			uasort($this->mCollated,array('self','sort'));
+			array_walk($this->mCollated,array('self','format'));
+			if ($this->visible) {
+				print '<pre>'.self::$out.'</pre>';
+			} else {
+				print "<!--\n".self::$out."\n-->\n";
+			}
+		}
+	}
+
+	/* dense is good */
+	static function sort($a,$b) { return $a['real']<$b['real']; /* sort descending by time elapsed */ }
+	static function format($item,$key) { self::$out .= sprintf("%3.6f %6d - %s\n",$item['real'],$item['count'], $key); }
+}
diff --git a/includes/profiler/ProfilerSimpleTrace.php b/includes/profiler/ProfilerSimpleTrace.php
new file mode 100644
index 0000000000..8d1a0d81ba
--- /dev/null
+++ b/includes/profiler/ProfilerSimpleTrace.php
@@ -0,0 +1,72 @@
+<?php
+/**
+ * @file
+ * @ingroup Profiler
+ */
+
+if ( !class_exists( 'ProfilerSimple' ) ) {
+	require_once(dirname(__FILE__).'/ProfilerSimple.php');
+}
+
+/**
+ * Execution trace
+ * @todo document methods (?)
+ * @ingroup Profiler
+ */
+class ProfilerSimpleTrace extends ProfilerSimple {
+	var $mMinimumTime = 0;
+	var $mProfileID = false;
+	var $trace = "";
+	var $memory = 0;
+
+	function __construct() {
+		global $wgRequestTime, $wgRUstart;
+		if (!empty($wgRequestTime) && !empty($wgRUstart)) {
+			$this->mWorkStack[] = array( '-total', 0, $wgRequestTime,$this->getCpuTime($wgRUstart));
+			$elapsedcpu = $this->getCpuTime() - $this->getCpuTime($wgRUstart);
+			$elapsedreal = microtime(true) - $wgRequestTime;
+		}
+		$this->trace .= "Beginning trace: \n";
+	}
+
+	function profileIn($functionname) {
+		$this->mWorkStack[] = array($functionname, count( $this->mWorkStack ), microtime(true), $this->getCpuTime());
+		$this->trace .= "         " . sprintf("%6.1f",$this->memoryDiff()) . str_repeat( " ", count($this->mWorkStack)) . " > " . $functionname . "\n";
+	}
+
+	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->trace .= "Profiling error: $functionname\n";
+		} else {
+			if ($functionname == 'close') {
+				$message = "Profile section ended by close(): {$ofname}";
+				$functionname = $ofname;
+				$this->trace .= $message . "\n";
+			}
+			elseif ($ofname != $functionname) {
+				$this->trace .= "Profiling error: in({$ofname}), out($functionname)";
+			}
+			$elapsedcpu = $this->getCpuTime() - $octime;
+			$elapsedreal = microtime(true) - $ortime;
+			$this->trace .= sprintf("%03.6f %6.1f",$elapsedreal,$this->memoryDiff()) .  str_repeat(" ",count($this->mWorkStack)+1) . " < " . $functionname . "\n";
+		}
+	}
+	
+	function memoryDiff() {
+		$diff = memory_get_usage() - $this->memory;
+		$this->memory = memory_get_usage();
+		return $diff/1024;
+	}
+
+	function getOutput() {
+		print "<!-- \n {$this->trace} \n -->";
+	}
+}
diff --git a/includes/profiler/ProfilerSimpleUDP.php b/includes/profiler/ProfilerSimpleUDP.php
new file mode 100644
index 0000000000..67ad97f654
--- /dev/null
+++ b/includes/profiler/ProfilerSimpleUDP.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * @file
+ * @ingroup Profiler
+ */
+
+require_once(dirname(__FILE__).'/ProfilerSimple.php');
+
+/**
+ * ProfilerSimpleUDP class, that sends out messages for 'udpprofile' daemon
+ * (the one from mediawiki/trunk/udpprofile SVN )
+ * @ingroup Profiler
+ */
+class ProfilerSimpleUDP extends ProfilerSimple {
+	function getFunctionReport() {
+		global $wgUDPProfilerHost, $wgUDPProfilerPort;
+
+		if ( $this->mCollated['-total']['real'] < $this->mMinimumTime ) {
+			# Less than minimum, ignore
+			return;
+		}
+
+		$sock = socket_create(AF_INET, SOCK_DGRAM, SOL_UDP);
+		$plength=0;
+		$packet="";
+		foreach ($this->mCollated as $entry=>$pfdata) {
+			$pfline=sprintf ("%s %s %d %f %f %f %f %s\n", $this->getProfileID(),"-",$pfdata['count'],
+				$pfdata['cpu'],$pfdata['cpu_sq'],$pfdata['real'],$pfdata['real_sq'],$entry);
+			$length=strlen($pfline);
+			/* printf("<!-- $pfline -->"); */
+			if ($length+$plength>1400) {
+				socket_sendto($sock,$packet,$plength,0,$wgUDPProfilerHost,$wgUDPProfilerPort);
+				$packet="";
+				$plength=0;
+			}
+			$packet.=$pfline;
+			$plength+=$length;
+		}
+		socket_sendto($sock,$packet,$plength,0x100,$wgUDPProfilerHost,$wgUDPProfilerPort);
+	}
+}
diff --git a/includes/profiler/ProfilerStub.php b/includes/profiler/ProfilerStub.php
new file mode 100644
index 0000000000..e624e6f019
--- /dev/null
+++ b/includes/profiler/ProfilerStub.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * Stub profiling functions
+ * @file
+ * @ingroup Profiler
+ */
+
+/** backward compatibility */
+$wgProfiling = false;
+$wgProfiler = null;
+
+/** is setproctitle function available ? */
+$haveProctitle = function_exists( 'setproctitle' );
+
+/**
+ * Begin profiling of a function
+ * @param $fn string
+ */
+function wfProfileIn( $fn = '' ) {
+	global $hackwhere, $wgDBname, $haveProctitle;
+	if( $haveProctitle ){
+		$hackwhere[] = $fn;
+		setproctitle( $fn . " [$wgDBname]" );
+	}
+}
+
+/**
+ * Stop profiling of a function
+ * @param $fn string
+ */
+function wfProfileOut( $fn = '' ) {
+	global $hackwhere, $wgDBname, $haveProctitle;
+	if( !$haveProctitle ) {
+		return;
+	}
+	if( count( $hackwhere ) ) {
+		array_pop( $hackwhere );
+	}
+	if( count( $hackwhere ) ) {
+		setproctitle( $hackwhere[count( $hackwhere )-1] . " [$wgDBname]" );
+	}
+}
+
+/**
+ * Does nothing, just for compatibility 
+ */
+function wfGetProfilingOutput( $s, $e ) {}
+
+/**
+ * Does nothing, just for compatibility 
+ */
+function wfProfileClose() {}