From 370e83bb0dfd0c70de268c93bf07ad5ee0897192 Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Fri, 15 Aug 2008 01:29:47 +0200 Subject: Update auf 1.13.0 --- profileinfo.php | 111 ++++++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 88 insertions(+), 23 deletions(-) (limited to 'profileinfo.php') diff --git a/profileinfo.php b/profileinfo.php index 9290ad40..032df3f2 100644 --- a/profileinfo.php +++ b/profileinfo.php @@ -36,15 +36,27 @@ padding-right: 0.5em; } - td.time, td.timep, td.count, td.cpr { + 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: #fffff0; + } + td.memoryp, td.mpc, td.mpr { + background-color: #f0f8ff; + } + td.count, td,cpr { + background-color: #f0fff0; + } + td.name { + background-color: #f9f9f9; + } name = $name; $this->count = $count; $this->time = $time; + $this->memory = $memory; $this->children = array(); } @@ -86,7 +99,7 @@ class profile_point { } function display($indent = 0.0) { - global $expand, $totaltime, $totalcount; + global $expand, $totaltime, $totalmemory, $totalcount; usort($this->children, "compare_point"); $extet = ''; @@ -108,18 +121,24 @@ class profile_point { } ?> - fmttime() ?> - time() / $totaltime * 100 ) ?> - count() ?> - count() / $totalcount ), 2 ) ?> - + name()) . $extet ?> + time() / $totaltime * 100 ) ?> + memory() / $totalmemory * 100 ) ?> + count() ?> + callsPerRequest() ), 2 ) ?> + timePerCall() ), 2 ) ?> + memoryPerCall() / 1024 ), 2 ) ?> + time() / $totalcount ), 2 ) ?> + memory() / $totalcount / 1024 ), 2 ) ?> children as $child) + if ($ex) { + foreach ($this->children as $child) { $child->display($indent + 2); + } + } } function name() { @@ -133,6 +152,33 @@ 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); + } + + function timePerRequest() { + global $totalcount; + return @($this->time / $totalcount); + } + + function memoryPerRequest() { + global $totalcount; + return @($this->memory / $totalcount); + } function fmttime() { return sprintf("%5.02f", $this->time); @@ -146,12 +192,24 @@ function compare_point($a, $b) { 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", "count", "name"); +$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)) $sort = $_REQUEST['sort']; @@ -160,8 +218,8 @@ $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_name - FROM profiling + SELECT pf_count, pf_time, pf_memory, pf_name + FROM {$wgDBprefix}profiling ORDER BY pf_name ASC ", $dbh) or die("query failed: " . mysql_error()); @@ -179,17 +237,22 @@ else $filter = '';

- +

- - - - + + + + + + + +pf_name, $o->pf_count, $o->pf_time); + $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(); } if ($last !== false) { if (preg_match("/^".preg_quote($last->name(), "/")."/", $next->name())) { @@ -221,7 +285,7 @@ while (($o = mysql_fetch_object($res)) !== false) { } } $last = $next; - if (preg_match("/^query: /", $next->name())) { + if (preg_match("/^query: /", $next->name()) || preg_match("/^query-m: /", $next->name())) { $sqltotal += $next->time(); $queries[] = $next; } else { @@ -229,7 +293,7 @@ while (($o = mysql_fetch_object($res)) !== false) { } } -$s = new profile_point("SQL Queries", 0, $sqltotal); +$s = new profile_point("SQL Queries", 0, $sqltotal, 0, 0); foreach ($queries as $q) $s->add_child($q); $points[] = $s; @@ -245,7 +309,8 @@ foreach ($points as $point) { ?>

">Time	Time (%)	">Count	Avg calls per request	">Name	">Time (%)	">Memory (%)	">Count	">Calls/req	">ms/call	">kb/call	">ms/req	">kb/req

Total time:

+Total time: +Total memory: