Profiling data

From 08aa4418c30cfc18ccc69a0f0f9cb9e17be6c196 Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Mon, 12 Aug 2013 09:28:15 +0200 Subject: Update to MediaWiki 1.21.1 --- profileinfo.php | 401 ++++++++++++++++++++++++++++++++++---------------------- 1 file changed, 242 insertions(+), 159 deletions(-) (limited to 'profileinfo.php') diff --git a/profileinfo.php b/profileinfo.php index bbd5fc8a..4117d975 100644 --- a/profileinfo.php +++ b/profileinfo.php @@ -34,69 +34,138 @@ if ( isset( $_SERVER['MW_COMPILED'] ) ) { require ( __DIR__ . '/includes/WebStart.php' ); } - header( 'Content-Type: text/html; charset=utf-8' ); ?> + -Profiling data - + a { + color: #0645AD; + text-decoration: none; + } + + a:hover { + text-decoration: underline; + } + + /*! + * Bootstrap v2.1.1 + * + * Copyright 2012 Twitter, Inc + * Licensed under the Apache License v2.0 + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Designed and built with all the love in the world @twitter by @mdo and @fat. + */ + + table { + max-width: 100%; + background-color: transparent; + border-collapse: collapse; + border-spacing: 0; + } + + .table { + width: 100%; + margin-bottom: 20px; + } + + .table th, + .table td { + padding: 0.1em; + text-align: left; + vertical-align: top; + border-top: 1px solid #ddd; + } + + .table th { + font-weight: bold; + } + + .table thead th { + vertical-align: bottom; + } + + .table thead:first-child tr:first-child th, + .table thead:first-child tr:first-child td { + border-top: 0; + } + + .table tbody + tbody { + border-top: 2px solid #ddd; + } + + .table-condensed th, + .table-condensed td { + padding: 4px 5px; + } + + .table-striped tbody tr:nth-child(odd) td, + .table-striped tbody tr:nth-child(odd) th { + background-color: #f9f9f9; + } + + .table-hover tbody tr:hover td, + .table-hover tbody tr:hover th { + background-color: #f5f5f5; + } + + hr { + margin: 20px 0; + border: 0; + border-top: 1px solid #eee; + border-bottom: 1px solid #fff; + } + Disabled

\n"; - echo ""; + echo '

Disabled

' + . ''; exit( 1 ); } $dbr = wfGetDB( DB_SLAVE ); -if( !$dbr->tableExists( 'profiling' ) ) { - echo "

No 'profiling' table exists, so we can't show you anything.

\n"; - echo "

If you want to log profiling data, create the table using " - . "maintenance/archives/patch-profiling.sql and enable " - . "\$wgProfileToDatabase.

\n"; - echo ""; +if ( !$dbr->tableExists( 'profiling' ) ) { + echo '

No profiling table exists, so we can\'t show you anything.

' + . '

If you want to log profiling data, enable $wgProfileToDatabase' + . ' in your LocalSettings.php and run maintenance/update.php to' + . ' create the profiling table.' + . ''; exit( 1 ); } $expand = array(); -if ( isset( $_REQUEST['expand'] ) ) - foreach( explode( ',', $_REQUEST['expand'] ) as $f ) +if ( isset( $_REQUEST['expand'] ) ) { + foreach ( explode( ',', $_REQUEST['expand'] ) as $f ) { $expand[$f] = true; + } +} class profile_point { var $name; @@ -123,10 +192,12 @@ class profile_point { $ex = isset( $expand[$this->name()] ); + $anchor = str_replace( '"', '', $this->name() ); + if ( !$ex ) { if ( count( $this->children ) ) { $url = getEscapedProfileUrl( false, false, $expand + array( $this->name() => true ) ); - $extet = " [+]"; + $extet = " [+]"; } else { $extet = ''; } @@ -137,23 +208,25 @@ class profile_point { $e += array( $name => $ep ); } } - - $extet = " [–]"; + $url = getEscapedProfileUrl( false, false, $e ); + $extet = " [–]"; } ?> - - - name() ) . $extet ?> - - time() / self::$totaltime * 100 ) ?> - memory() / self::$totalmemory * 100 ) ?> - count() ?> - callsPerRequest() ), 2 ) ?> - timePerCall() ), 2 ) ?> - memoryPerCall() / 1024 ), 2 ) ?> - time() / self::$totalcount ), 2 ) ?> - memory() / self::$totalcount / 1024 ), 2 ) ?> - + + +

+ name() ) ) . $extet ?> +

+ + time() / self::$totaltime * 100 ); ?> + memory() / self::$totalmemory * 100 ); ?> + count(); ?> + callsPerRequest() ), 2 ); ?> + timePerCall() ), 2 ); ?> + memoryPerCall() / 1024 ), 2 ); ?> + time() / self::$totalcount ), 2 ); ?> + memory() / self::$totalcount / 1024 ), 2 ); ?> + children as $child ) { @@ -173,160 +246,170 @@ class profile_point { function time() { return $this->time; } - + function memory() { return $this->memory; } - + function timePerCall() { return @( $this->time / $this->count ); } - + function memoryPerCall() { return @( $this->memory / $this->count ); } - + function callsPerRequest() { return @( $this->count / self::$totalcount ); } - + function timePerRequest() { return @( $this->time / self::$totalcount ); } - + function memoryPerRequest() { return @( $this->memory / self::$totalcount ); } function fmttime() { - return sprintf( "%5.02f", $this->time ); + return sprintf( '%5.02f', $this->time ); } }; -function compare_point(profile_point $a, profile_point $b) { +function compare_point( profile_point $a, profile_point $b ) { global $sort; switch ( $sort ) { - case "name": - return strcmp( $a->name(), $b->name() ); - case "time": - return $a->time() > $b->time() ? -1 : 1; - case "memory": - return $a->memory() > $b->memory() ? -1 : 1; - case "count": - return $a->count() > $b->count() ? -1 : 1; - case "time_per_call": - return $a->timePerCall() > $b->timePerCall() ? -1 : 1; - case "memory_per_call": - return $a->memoryPerCall() > $b->memoryPerCall() ? -1 : 1; - case "calls_per_req": - return $a->callsPerRequest() > $b->callsPerRequest() ? -1 : 1; - case "time_per_req": - return $a->timePerRequest() > $b->timePerRequest() ? -1 : 1; - case "memory_per_req": - return $a->memoryPerRequest() > $b->memoryPerRequest() ? -1 : 1; + case 'name': + return strcmp( $a->name(), $b->name() ); + case 'time': + return $a->time() > $b->time() ? -1 : 1; + case 'memory': + return $a->memory() > $b->memory() ? -1 : 1; + case 'count': + return $a->count() > $b->count() ? -1 : 1; + case 'time_per_call': + return $a->timePerCall() > $b->timePerCall() ? -1 : 1; + case 'memory_per_call': + return $a->memoryPerCall() > $b->memoryPerCall() ? -1 : 1; + case 'calls_per_req': + return $a->callsPerRequest() > $b->callsPerRequest() ? -1 : 1; + case 'time_per_req': + return $a->timePerRequest() > $b->timePerRequest() ? -1 : 1; + case 'memory_per_req': + return $a->memoryPerRequest() > $b->memoryPerRequest() ? -1 : 1; } } $sorts = array( 'time', 'memory', 'count', 'calls_per_req', 'name', 'time_per_call', 'memory_per_call', 'time_per_req', 'memory_per_req' ); $sort = 'time'; -if ( isset( $_REQUEST['sort'] ) && in_array( $_REQUEST['sort'], $sorts ) ) +if ( isset( $_REQUEST['sort'] ) && in_array( $_REQUEST['sort'], $sorts ) ) { $sort = $_REQUEST['sort']; +} $res = $dbr->select( 'profiling', '*', array(), 'profileinfo.php', array( 'ORDER BY' => 'pf_name ASC' ) ); -if (isset( $_REQUEST['filter'] ) ) +if ( isset( $_REQUEST['filter'] ) ) { $filter = $_REQUEST['filter']; -else +} else { $filter = ''; +} ?> - - - - - - - - - - - - - $_filter ? $_filter : $filter, - 'sort' => $_sort ? $_sort : $sort, - 'expand' => implode( ',', array_keys( $_expand ) ) - ) ) - ); -} +

Name	Time (%)	Memory (%)	Count	Calls/req	ms/call	kb/call	ms/req	kb/req

+ + + + + + + + + + + + + + + pf_name, $o->pf_count, $o->pf_time, $o->pf_memory ); - if( $next->name() == '-total' ) { - profile_point::$totaltime = $next->time(); - profile_point::$totalcount = $next->count(); - profile_point::$totalmemory = $next->memory(); + return htmlspecialchars( + '?' . + wfArrayToCgi( array( + 'filter' => $_filter ? $_filter : $filter, + 'sort' => $_sort ? $_sort : $sort, + 'expand' => implode( ',', array_keys( $_expand ) ) + ) ) + ); } - if ( $last !== false ) { - if ( preg_match( "/^".preg_quote( $last->name(), "/" )."/", $next->name() ) ) { - $last->add_child($next); - continue; + + $points = array(); + $queries = array(); + $sqltotal = 0.0; + + $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' ) { + profile_point::$totaltime = $next->time(); + profile_point::$totalcount = $next->count(); + profile_point::$totalmemory = $next->memory(); + } + if ( $last !== false ) { + if ( preg_match( '/^' . preg_quote( $last->name(), '/' ) . '/', $next->name() ) ) { + $last->add_child( $next ); + continue; + } + } + $last = $next; + if ( preg_match( '/^query: /', $next->name() ) || preg_match( '/^query-m: /', $next->name() ) ) { + $sqltotal += $next->time(); + $queries[] = $next; + } else { + $points[] = $next; } } - $last = $next; - if ( preg_match( "/^query: /", $next->name() ) || preg_match( "/^query-m: /", $next->name() ) ) { - $sqltotal += $next->time(); - $queries[] = $next; - } else { - $points[] = $next; - } -} -$s = new profile_point( "SQL Queries", 0, $sqltotal, 0, 0 ); -foreach ( $queries as $q ) - $s->add_child($q); -$points[] = $s; + $s = new profile_point( 'SQL Queries', 0, $sqltotal, 0, 0 ); + foreach ( $queries as $q ) + $s->add_child( $q ); + $points[] = $s; -usort( $points, "compare_point" ); + usort( $points, 'compare_point' ); -foreach ( $points as $point ) { - if ( strlen( $filter ) && !strstr( $point->name(), $filter ) ) - continue; + foreach ( $points as $point ) { + if ( strlen( $filter ) && !strstr( $point->name(), $filter ) ) { + continue; + } - $point->display( $expand ); -} -?> + $point->display( $expand ); + } + ?> +

Name	Time (%)	Memory (%)	Count	Calls/req	ms/call	kb/call	ms/req	kb/req

Total time:

Total memory:

-- cgit v1.2.2