X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=profileinfo.php;h=032df3f20f7f1cc92897b43b7e3dd1d685920aee;hb=32494abdb123925fbc31baa0464d48472a4aedee;hp=52658fb49ac6c2c048c817ec8e2bfdaec6651d46;hpb=0cb21ebe29c91d9ebc78b80e5c7ca7d3c4ab5cc1;p=lhc%2Fweb%2Fwiklou.git
diff --git a/profileinfo.php b/profileinfo.php
index 52658fb49a..032df3f20f 100644
--- a/profileinfo.php
+++ b/profileinfo.php
@@ -36,33 +36,44 @@
padding-right: 0.5em;
}
- td.time, td.count {
+ 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;
+ }
$GLOBALS overwrite vulnerability';
- die( -1 );
-}
+$wgDBadminuser = $wgDBadminpassword = $wgDBserver = $wgDBname = $wgEnableProfileInfo = $wgDBprefix = false;
-require_once("./includes/Defines.php");
-require_once("./LocalSettings.php");
+define( 'MW_NO_SETUP', 1 );
+require_once( './includes/WebStart.php' );
require_once("./AdminSettings.php");
+require_once( './includes/GlobalFunctions.php' );
if (!$wgEnableProfileInfo) {
- wfDie("disabled");
+ echo "disabled\n";
+ exit( 1 );
}
foreach (array("wgDBadminuser", "wgDBadminpassword", "wgDBserver", "wgDBname") as $var)
- if ($$var === false)
- wfDie("AdminSettings.php not correct");
+ if ($$var === false) {
+ echo "AdminSettings.php not correct\n";
+ exit( 1 );
+ }
+
$expand = array();
if (isset($_REQUEST['expand']))
@@ -75,10 +86,11 @@ class profile_point {
var $time;
var $children;
- function profile_point($name, $count, $time) {
+ function profile_point($name, $count, $time, $memory ) {
$this->name = $name;
$this->count = $count;
$this->time = $time;
+ $this->memory = $memory;
$this->children = array();
}
@@ -87,7 +99,7 @@ class profile_point {
}
function display($indent = 0.0) {
- global $expand;
+ global $expand, $totaltime, $totalmemory, $totalcount;
usort($this->children, "compare_point");
$extet = '';
@@ -109,16 +121,24 @@ class profile_point {
}
?>
- fmttime() ?> |
- count() ?> |
-
+ |
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() {
@@ -132,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);
@@ -145,24 +192,36 @@ 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'];
$dbh = mysql_connect($wgDBserver, $wgDBadminuser, $wgDBadminpassword)
- or wfDie("mysql server failed: " . mysql_error());
-mysql_select_db($wgDBname, $dbh) or wfDie(mysql_error($dbh));
+ 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 wfDie("query failed: " . mysql_error());
+", $dbh) or die("query failed: " . mysql_error());
if (isset($_REQUEST['filter']))
$filter = $_REQUEST['filter'];
@@ -178,14 +237,22 @@ else $filter = '';
-
+
-">Time |
-">Count |
">Name |
+">Time (%) |
+">Memory (%) |
+">Count |
+">Calls/req |
+">ms/call |
+">kb/call |
+">ms/req |
+">kb/req |
pf_name, $o->pf_count, $o->pf_time);
- $totaltime += $next->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())) {
$last->add_child($next);
@@ -214,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 {
@@ -222,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;
@@ -238,7 +309,8 @@ foreach ($points as $point) {
?>
-Total time:
+Total time:
+Total memory: