X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=blobdiff_plain;f=profileinfo.php;h=068c58b83bcf5449fe0f3923c70db6f9d4d1a14c;hb=2a9dfc002181309fc15d45baec3a3bbf92064e32;hp=fcce6d71c6de33e3affc108e79a5f637fa396c41;hpb=1c9773bd015adbf8aedb3b1777f0e087906baf6f;p=lhc%2Fweb%2Fwiklou.git diff --git a/profileinfo.php b/profileinfo.php index fcce6d71c6..068c58b83b 100644 --- a/profileinfo.php +++ b/profileinfo.php @@ -1,72 +1,165 @@ - + + Profiling data - Disabled

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

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

' + . '

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

' + . ''; exit( 1 ); } @@ -81,7 +174,9 @@ class profile_point { var $time; var $children; - function profile_point( $name, $count, $time, $memory ) { + static $totaltime, $totalmemory, $totalcount; + + function __construct( $name, $count, $time, $memory ) { $this->name = $name; $this->count = $count; $this->time = $time; @@ -93,45 +188,46 @@ class profile_point { $this->children[] = $child; } - function display($indent = 0.0) { - global $expand, $totaltime, $totalmemory, $totalcount; + function display( $expand, $indent = 0.0 ) { usort( $this->children, 'compare_point' ); - $extet = ''; - if ( isset( $expand[$this->name()] ) ) - $ex = true; - else $ex = false; + $ex = isset( $expand[$this->name()] ); + if ( !$ex ) { if ( count( $this->children ) ) { - $url = makeurl( false, false, $expand + array( $this->name() => true ) ); - $extet = " [+]"; - } else $extet = ''; + $url = getEscapedProfileUrl( false, false, $expand + array( $this->name() => true ) ); + $extet = ' [+]'; + } else { + $extet = ''; + } } else { $e = array(); - foreach ( $expand as $name => $ep ) - if ( $name != $this->name() ) + foreach ( $expand as $name => $ep ) { + if ( $name != $this->name() ) { $e += array( $name => $ep ); + } + } - $extet = " [–]"; + $extet = ' [–]'; } ?> - +
name() ) . $extet ?> - - time() / $totaltime * 100 ) ?> - memory() / $totalmemory * 100 ) ?> - count() ?> - callsPerRequest() ), 2 ) ?> - timePerCall() ), 2 ) ?> - memoryPerCall() / 1024 ), 2 ) ?> - time() / $totalcount ), 2 ) ?> - memory() / $totalcount / 1024 ), 2 ) ?> +
+ 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 ) { - $child->display( $indent + 2 ); + $child->display( $expand, $indent + 2 ); } } } @@ -147,59 +243,56 @@ 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() { - global $totalcount; - return @( $this->count / $totalcount ); + return @( $this->count / self::$totalcount ); } - + function timePerRequest() { - global $totalcount; - return @( $this->time / $totalcount ); + return @( $this->time / self::$totalcount ); } - + function memoryPerRequest() { - global $totalcount; - return @( $this->memory / $totalcount ); + return @( $this->memory / self::$totalcount ); } function fmttime() { - return sprintf( "%5.02f", $this->time ); + return sprintf( '%5.02f', $this->time ); } }; -function compare_point( $a, $b ) { +function compare_point(profile_point $a, profile_point $b) { global $sort; switch ( $sort ) { - case "name": + case 'name': return strcmp( $a->name(), $b->name() ); - case "time": + case 'time': return $a->time() > $b->time() ? -1 : 1; - case "memory": + case 'memory': return $a->memory() > $b->memory() ? -1 : 1; - case "count": + case 'count': return $a->count() > $b->count() ? -1 : 1; - case "time_per_call": + case 'time_per_call': return $a->timePerCall() > $b->timePerCall() ? -1 : 1; - case "memory_per_call": + case 'memory_per_call': return $a->memoryPerCall() > $b->memoryPerCall() ? -1 : 1; - case "calls_per_req": + case 'calls_per_req': return $a->callsPerRequest() > $b->callsPerRequest() ? -1 : 1; - case "time_per_req": + case 'time_per_req': return $a->timePerRequest() > $b->timePerRequest() ? -1 : 1; - case "memory_per_req": + case 'memory_per_req': return $a->memoryPerRequest() > $b->memoryPerRequest() ? -1 : 1; } } @@ -210,8 +303,6 @@ $sort = 'time'; if ( isset( $_REQUEST['sort'] ) && in_array( $_REQUEST['sort'], $sorts ) ) $sort = $_REQUEST['sort']; - -$dbr = wfGetDB( DB_SLAVE ); $res = $dbr->select( 'profiling', '*', array(), 'profileinfo.php', array( 'ORDER BY' => 'pf_name ASC' ) ); if (isset( $_REQUEST['filter'] ) ) @@ -222,40 +313,47 @@ else ?>

- - -"/> - + + +"> +

- - - - - - - - - - - - +
NameTime (%)Memory (%)CountCalls/reqms/callkb/callms/reqkb/req
+ + + + + + + + + + + + + + $_filter ? $_filter : $filter, + 'sort' => $_sort ? $_sort : $sort, + 'expand' => implode( ',', array_keys( $_expand ) ) + ) ) + ); } $points = array(); @@ -266,18 +364,18 @@ $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' ) { - $totaltime = $next->time(); - $totalcount = $next->count(); - $totalmemory = $next->memory(); + 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() ) ) { + 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() ) ) { + if ( preg_match( '/^query: /', $next->name() ) || preg_match( '/^query-m: /', $next->name() ) ) { $sqltotal += $next->time(); $queries[] = $next; } else { @@ -285,23 +383,25 @@ foreach( $res as $o ) { } } -$s = new profile_point( "SQL Queries", 0, $sqltotal, 0, 0 ); +$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; - $point->display(); + $point->display( $expand ); } ?> +
NameTime (%)Memory (%)CountCalls/reqms/callkb/callms/reqkb/req
- -

Total time:

-

Total memory:

+
+

Total time:

+

Total memory:

+