Profiling data

X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dcompta/comptes/journal.php?a=blobdiff_plain;f=profileinfo.php;h=068c58b83bcf5449fe0f3923c70db6f9d4d1a14c;hb=0d732f31852be8b63b76a559faa283157cd4883e;hp=d1cf853632f473d60bee3763b8b3b3bf5e53921f;hpb=d67b431f5a5fca463563f01849415382373bbbec;p=lhc%2Fweb%2Fwiklou.git diff --git a/profileinfo.php b/profileinfo.php index d1cf853632..068c58b83b 100644 --- a/profileinfo.php +++ b/profileinfo.php @@ -1,88 +1,171 @@ - + + Profiling data - Disabled

' + . ''; exit( 1 ); } -foreach (array("wgDBadminuser", "wgDBadminpassword", "wgDBserver", "wgDBname") as $var) - if ($$var === false) { - echo "AdminSettings.php not correct\n"; - 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 ); +} $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 { @@ -91,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; @@ -99,49 +184,50 @@ class profile_point { $this->children = array(); } - function add_child($child) { + function add_child( $child ) { $this->children[] = $child; } - function display($indent = 0.0) { - global $expand, $totaltime, $totalmemory, $totalcount; - usort($this->children, "compare_point"); + function display( $expand, $indent = 0.0 ) { + usort( $this->children, 'compare_point' ); + + $ex = isset( $expand[$this->name()] ); - $extet = ''; - if (isset($expand[$this->name()])) - $ex = true; - else $ex = false; - if (!$ex) { - if (count($this->children)) { - $url = makeurl(false, false, $expand + array($this->name() => true)); - $extet = " [+]"; - } else $extet = ''; + if ( !$ex ) { + if ( count( $this->children ) ) { + $url = getEscapedProfileUrl( false, false, $expand + array( $this->name() => true ) ); + $extet = ' [+]'; + } else { + $extet = ''; + } } else { $e = array(); - foreach ($expand as $name => $ep) - if ($name != $this->name()) - $e += array($name => $ep); + 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 ) ?> +

+ 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) { - $child->display($indent + 2); + if ( $ex ) { + foreach ( $this->children as $child ) { + $child->display( $expand, $indent + 2 ); } } } @@ -157,118 +243,117 @@ class profile_point { function time() { return $this->time; } - + function memory() { return $this->memory; } - + function timePerCall() { - return @($this->time / $this->count); + return @( $this->time / $this->count ); } - + function memoryPerCall() { - return @($this->memory / $this->count); + 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": - return strcmp($a->name(), $b->name()); - case "time": + switch ( $sort ) { + case 'name': + return strcmp( $a->name(), $b->name() ); + 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; } } -$sorts = array("time","memory","count","calls_per_req","name","time_per_call","memory_per_call","time_per_req","memory_per_req"); +$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']; -$dbh = mysql_connect($wgDBserver, $wgDBadminuser, $wgDBadminpassword) - or die("mysql server failed: " . mysql_error()); -mysql_select_db($wgDBname, $dbh) or die(mysql_error($dbh)); -$res = mysql_query(" - SELECT pf_count, pf_time, pf_memory, pf_name - FROM {$wgDBprefix}profiling - ORDER BY pf_name ASC -", $dbh) or die("query failed: " . mysql_error()); +$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 $filter = ''; +else + $filter = ''; ?> - - - - - - - - - - - - - +

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

+ + + + + + + + + + + + + + $_filter ? $_filter : $filter, + 'sort' => $_sort ? $_sort : $sort, + 'expand' => implode( ',', array_keys( $_expand ) ) + ) ) + ); } $points = array(); @@ -276,21 +361,21 @@ $queries = array(); $sqltotal = 0.0; $last = false; -while (($o = mysql_fetch_object($res)) !== false) { - $next = new profile_point($o->pf_name, $o->pf_count, $o->pf_time, $o->pf_memory); +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 ( $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())) { + if ( preg_match( '/^query: /', $next->name() ) || preg_match( '/^query-m: /', $next->name() ) ) { $sqltotal += $next->time(); $queries[] = $next; } else { @@ -298,29 +383,25 @@ while (($o = mysql_fetch_object($res)) !== false) { } } -$s = new profile_point("SQL Queries", 0, $sqltotal, 0, 0); -foreach ($queries as $q) +$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)) +foreach ( $points as $point ) { + if ( strlen( $filter ) && !strstr( $point->name(), $filter ) ) continue; - $point->display(); + $point->display( $expand ); } ?> +

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

- -

Total time:

Total memory:

- +

Total time:

Total memory: