diff options
Diffstat (limited to 'profileinfo.php')
| -rw-r--r-- | profileinfo.php | 401 |
1 files changed, 242 insertions, 159 deletions
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' ); ?> +<!DOCTYPE html> <html> <head> -<title>Profiling data</title> -<style type="text/css"> - th { - text-align: left; - border-bottom: solid 1px black; - } + <meta charset="UTF-8"> + <title>Profiling data</title> + <style> + /* noc.wikimedia.org/base.css */ + + * { + margin: 0; + padding: 0; + } - th, td { - padding-left: 0.5em; - padding-right: 0.5em; - } + body { + padding: 0.5em 1em; + background: #fff; + font: 14px/1.6 sans-serif; + color: #333; + } - td.timep, td.memoryp, td.count, td.cpr, td.tpc, td.mpc, td.tpr, td.mpr { - text-align: right; - } - td.timep, td.tpc, td.tpr { - background-color: #ffff80; - } - td.memoryp, td.mpc, td.mpr { - background-color: #80f8ff; - } - td.count, td,cpr { - background-color: #80ff80; - } - td.name { - background-color: #89f9f9; - } + p, ul, ol, table { + margin: 0.5em 0; + } - tr:hover { - font-weight: bold; - } -</style> + 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; + } + </style> </head> <body> <?php if ( !$wgEnableProfileInfo ) { - echo "<p>Disabled</p>\n"; - echo "</body></html>"; + echo '<p>Disabled</p>' + . '</body></html>'; exit( 1 ); } $dbr = wfGetDB( DB_SLAVE ); -if( !$dbr->tableExists( 'profiling' ) ) { - echo "<p>No 'profiling' table exists, so we can't show you anything.</p>\n"; - echo "<p>If you want to log profiling data, create the table using " - . "<tt>maintenance/archives/patch-profiling.sql</tt> and enable " - . "<tt>\$wgProfileToDatabase</tt>.</p>\n"; - echo "</body></html>"; +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' + . ' create the profiling table.' + . '</body></html>'; 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 = " <a href=\"$url\">[+]</a>"; + $extet = " <a id=\"{$anchor}\" href=\"{$url}#{$anchor}\">[+]</a>"; } else { $extet = ''; } @@ -137,23 +208,25 @@ class profile_point { $e += array( $name => $ep ); } } - - $extet = " <a href=\"" . getEscapedProfileUrl( false, false, $e ) . "\">[–]</a>"; + $url = getEscapedProfileUrl( false, false, $e ); + $extet = " <a id=\"{$anchor}\" href=\"{$url}#{$anchor}\">[–]</a>"; } ?> - <tr> - <td class="name" style="padding-left: <?php echo $indent ?>em;"> - <?php echo htmlspecialchars( $this->name() ) . $extet ?> - </td> - <td class="timep"><?php echo @wfPercent( $this->time() / self::$totaltime * 100 ) ?></td> - <td class="memoryp"><?php echo @wfPercent( $this->memory() / self::$totalmemory * 100 ) ?></td> - <td class="count"><?php echo $this->count() ?></td> - <td class="cpr"><?php echo round( sprintf( '%.2f', $this->callsPerRequest() ), 2 ) ?></td> - <td class="tpc"><?php echo round( sprintf( '%.2f', $this->timePerCall() ), 2 ) ?></td> - <td class="mpc"><?php echo round( sprintf( '%.2f' ,$this->memoryPerCall() / 1024 ), 2 ) ?></td> - <td class="tpr"><?php echo @round( sprintf( '%.2f', $this->time() / self::$totalcount ), 2 ) ?></td> - <td class="mpr"><?php echo @round( sprintf( '%.2f' ,$this->memory() / self::$totalcount / 1024 ), 2 ) ?></td> - </tr> + <tr> + <th> + <div style="margin-left: <?php echo (int)$indent; ?>em;"> + <?php echo htmlspecialchars( str_replace( ',', ', ', $this->name() ) ) . $extet ?> + </div> + </th> + <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> + <td class="mw-profileinfo-cpr"><?php echo round( sprintf( '%.2f', $this->callsPerRequest() ), 2 ); ?></td> + <td class="mw-profileinfo-tpc"><?php echo round( sprintf( '%.2f', $this->timePerCall() ), 2 ); ?></td> + <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> + </tr> <?php if ( $ex ) { foreach ( $this->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 = ''; +} ?> <form method="get" action="profileinfo.php"> -<p> -<input type="text" name="filter" value="<?php echo htmlspecialchars($filter)?>"/> -<input type="hidden" name="sort" value="<?php echo htmlspecialchars($sort)?>"/> -<input type="hidden" name="expand" value="<?php echo htmlspecialchars(implode(",", array_keys($expand)))?>"/> -<input type="submit" value="Filter" /> -</p> + <p> + <input type="text" name="filter" value="<?php echo htmlspecialchars( $filter ); ?>"> + <input type="hidden" name="sort" value="<?php echo htmlspecialchars( $sort ); ?>"> + <input type="hidden" name="expand" value="<?php echo htmlspecialchars( implode( ",", array_keys( $expand ) ) ); ?>"> + <input type="submit" value="Filter"> + </p> </form> -<table cellspacing="0" border="1"> -<tr id="top"> -<th><a href="<?php echo getEscapedProfileUrl( false, 'name' ) ?>">Name</a></th> -<th><a href="<?php echo getEscapedProfileUrl( false, 'time' ) ?>">Time (%)</a></th> -<th><a href="<?php echo getEscapedProfileUrl( false, 'memory' ) ?>">Memory (%)</a></th> -<th><a href="<?php echo getEscapedProfileUrl( false, 'count' ) ?>">Count</a></th> -<th><a href="<?php echo getEscapedProfileUrl( false, 'calls_per_req' ) ?>">Calls/req</a></th> -<th><a href="<?php echo getEscapedProfileUrl( false, 'time_per_call' ) ?>">ms/call</a></th> -<th><a href="<?php echo getEscapedProfileUrl( false, 'memory_per_call' ) ?>">kb/call</a></th> -<th><a href="<?php echo getEscapedProfileUrl( false, 'time_per_req' ) ?>">ms/req</a></th> -<th><a href="<?php echo getEscapedProfileUrl( false, 'memory_per_req' ) ?>">kb/req</a></th> -</tr> -<?php -profile_point::$totaltime = 0.0; -profile_point::$totalcount = 0; -profile_point::$totalmemory = 0.0; - -function getEscapedProfileUrl( $_filter = false, $_sort = false, $_expand = false ) { - global $filter, $sort, $expand; - - if ( $_expand === false ) - $_expand = $expand; - - return htmlspecialchars( - '?' . - wfArrayToCGI( array( - 'filter' => $_filter ? $_filter : $filter, - 'sort' => $_sort ? $_sort : $sort, - 'expand' => implode( ',', array_keys( $_expand ) ) - ) ) - ); -} +<table class="mw-profileinfo-table table table-striped table-hover"> + <thead> + <tr> + <th><a href="<?php echo getEscapedProfileUrl( false, 'name' ); ?>">Name</a></th> + <th><a href="<?php echo getEscapedProfileUrl( false, 'time' ); ?>">Time (%)</a></th> + <th><a href="<?php echo getEscapedProfileUrl( false, 'memory' ); ?>">Memory (%)</a></th> + <th><a href="<?php echo getEscapedProfileUrl( false, 'count' ); ?>">Count</a></th> + <th><a href="<?php echo getEscapedProfileUrl( false, 'calls_per_req' ); ?>">Calls/req</a></th> + <th><a href="<?php echo getEscapedProfileUrl( false, 'time_per_call' ); ?>">ms/call</a></th> + <th><a href="<?php echo getEscapedProfileUrl( false, 'memory_per_call' ); ?>">kb/call</a></th> + <th><a href="<?php echo getEscapedProfileUrl( false, 'time_per_req' ); ?>">ms/req</a></th> + <th><a href="<?php echo getEscapedProfileUrl( false, 'memory_per_req' ); ?>">kb/req</a></th> + </tr> + </thead> + <tbody> + <?php + profile_point::$totaltime = 0.0; + profile_point::$totalcount = 0; + profile_point::$totalmemory = 0.0; + + function getEscapedProfileUrl( $_filter = false, $_sort = false, $_expand = false ) { + global $filter, $sort, $expand; + + if ( $_expand === false ) { + $_expand = $expand; + } -$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(); + 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 ); + } + ?> + </tbody> </table> +<hr> +<p>Total time: <code><?php printf( '%5.02f', profile_point::$totaltime ); ?></code></p> -<p>Total time: <tt><?php printf("%5.02f", profile_point::$totaltime) ?></tt></p> -<p>Total memory: <tt><?php printf("%5.02f", profile_point::$totalmemory / 1024 ) ?></tt></p> +<p>Total memory: <code><?php printf( '%5.02f', profile_point::$totalmemory / 1024 ); ?></code></p> +<hr /> </body> </html> |