X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=profileinfo.php;h=4e3fb5ad28ca2f1640af72d44db90b6538424a09;hb=b65aea33c9ed5e731c8f4064db0f958cb9914058;hp=8120599e02f0a879a25df08b980dfa910f30eec9;hpb=f10c9815e69b59844c178d218640bd1ac0435896;p=lhc%2Fweb%2Fwiklou.git

diff --git a/profileinfo.php b/profileinfo.php
index 8120599e02..4e3fb5ad28 100644
--- a/profileinfo.php
+++ b/profileinfo.php
@@ -27,7 +27,7 @@
 
 ini_set( 'zlib.output_compression', 'off' );
 
-$wgEnableProfileInfo = $wgProfileToDatabase = false;
+$wgEnableProfileInfo = false;
 require __DIR__ . '/includes/WebStart.php';
 
 header( 'Content-Type: text/html; charset=utf-8' );
@@ -149,8 +149,8 @@ $dbr = wfGetDB( DB_SLAVE );
 
 if ( !$dbr->tableExists( 'profiling' ) ) {
 	echo '<p>No <code>profiling</code> table exists, so we can\'t show you anything.</p>'
-		. '<p>If you want to log profiling data, enable <code>$wgProfileToDatabase</code>'
-		. ' in your LocalSettings.php and run <code>maintenance/update.php</code> to'
+		. '<p>If you want to log profiling data, enable <code>$wgProfiler[\'output\'] = \'db\'</code>'
+		. ' in your StartProfiler.php and run <code>maintenance/update.php</code> to'
 		. ' create the profiling table.'
 		. '</body></html>';
 	exit( 1 );
@@ -163,15 +163,18 @@ if ( isset( $_REQUEST['expand'] ) ) {
 	}
 }
 
+// @codingStandardsIgnoreStart
 class profile_point {
-	var $name;
-	var $count;
-	var $time;
-	var $children;
+	// @codingStandardsIgnoreEnd
 
-	static $totaltime, $totalmemory, $totalcount;
+	public $name;
+	public $count;
+	public $time;
+	public $children;
 
-	function __construct( $name, $count, $time, $memory ) {
+	public static $totaltime, $totalmemory, $totalcount;
+
+	public function __construct( $name, $count, $time, $memory ) {
 		$this->name = $name;
 		$this->count = $count;
 		$this->time = $time;
@@ -179,11 +182,11 @@ class profile_point {
 		$this->children = array();
 	}
 
-	function add_child( $child ) {
+	public function add_child( $child ) {
 		$this->children[] = $child;
 	}
 
-	function display( $expand, $indent = 0.0 ) {
+	public function display( $expand, $indent = 0.0 ) {
 		usort( $this->children, 'compare_point' );
 
 		$ex = isset( $expand[$this->name()] );
@@ -214,6 +217,7 @@ class profile_point {
 				<?php echo htmlspecialchars( str_replace( ',', ', ', $this->name() ) ) . $extet ?>
 			</div>
 		</th>
+		<?php //@codingStandardsIgnoreStart ?>
 		<td class="mw-profileinfo-timep"><?php echo @wfPercent( $this->time() / self::$totaltime * 100 ); ?></td>
 		<td class="mw-profileinfo-memoryp"><?php echo @wfPercent( $this->memory() / self::$totalmemory * 100 ); ?></td>
 		<td class="mw-profileinfo-count"><?php echo $this->count(); ?></td>
@@ -222,6 +226,7 @@ class profile_point {
 		<td class="mw-profileinfo-mpc"><?php echo round( sprintf( '%.2f', $this->memoryPerCall() / 1024 ), 2 ); ?></td>
 		<td class="mw-profileinfo-tpr"><?php echo @round( sprintf( '%.2f', $this->time() / self::$totalcount ), 2 ); ?></td>
 		<td class="mw-profileinfo-mpr"><?php echo @round( sprintf( '%.2f', $this->memory() / self::$totalcount / 1024 ), 2 ); ?></td>
+		<?php //@codingStandardsIgnoreEnd ?>
 	</tr>
 		<?php
 		if ( $ex ) {
@@ -231,49 +236,61 @@ class profile_point {
 		}
 	}
 
-	function name() {
+	public function name() {
 		return $this->name;
 	}
 
-	function count() {
+	public function count() {
 		return $this->count;
 	}
 
-	function time() {
+	public function time() {
 		return $this->time;
 	}
 
-	function memory() {
+	public function memory() {
 		return $this->memory;
 	}
 
-	function timePerCall() {
+	public function timePerCall() {
+		// @codingStandardsIgnoreStart
 		return @( $this->time / $this->count );
+		// @codingStandardsIgnoreEnd
 	}
 
-	function memoryPerCall() {
+	public function memoryPerCall() {
+		// @codingStandardsIgnoreStart
 		return @( $this->memory / $this->count );
+		// @codingStandardsIgnoreEnd
 	}
 
-	function callsPerRequest() {
+	public function callsPerRequest() {
+		// @codingStandardsIgnoreStart
 		return @( $this->count / self::$totalcount );
+		// @codingStandardsIgnoreEnd
 	}
 
-	function timePerRequest() {
+	public function timePerRequest() {
+		// @codingStandardsIgnoreStart
 		return @( $this->time / self::$totalcount );
+		// @codingStandardsIgnoreEnd
 	}
 
-	function memoryPerRequest() {
+	public function memoryPerRequest() {
+		// @codingStandardsIgnoreStart
 		return @( $this->memory / self::$totalcount );
+		// @codingStandardsIgnoreEnd
 	}
 
-	function fmttime() {
+	public function fmttime() {
 		return sprintf( '%5.02f', $this->time );
 	}
 };
 
 function compare_point( profile_point $a, profile_point $b ) {
+	// @codingStandardsIgnoreStart
 	global $sort;
+	// @codingStandardsIgnoreEnd
 	switch ( $sort ) {
 		case 'name':
 			return strcmp( $a->name(), $b->name() );
@@ -342,7 +359,9 @@ if ( isset( $_REQUEST['filter'] ) ) {
 	profile_point::$totalmemory = 0.0;
 
 	function getEscapedProfileUrl( $_filter = false, $_sort = false, $_expand = false ) {
+		// @codingStandardsIgnoreStart
 		global $filter, $sort, $expand;
+		// @codingStandardsIgnoreEnd
 
 		if ( $_expand === false ) {
 			$_expand = $expand;
@@ -365,7 +384,7 @@ if ( isset( $_REQUEST['filter'] ) ) {
 	$last = false;
 	foreach ( $res as $o ) {
 		$next = new profile_point( $o->pf_name, $o->pf_count, $o->pf_time, $o->pf_memory );
-		if ( $next->name() == '-total' ) {
+		if ( $next->name() == '-total' || $next->name() == 'main()' ) {
 			profile_point::$totaltime = $next->time();
 			profile_point::$totalcount = $next->count();
 			profile_point::$totalmemory = $next->memory();