X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=blobdiff_plain;f=profileinfo.php;h=ecf69e50e1693f13ade7340182ea5732e4d1d10f;hb=5fc6bb9f16db3756bd48a48ab90355e26ec599cc;hp=15b292ac273c693e84b312a5cde8ee82feb40b0a;hpb=1a4afa8f7ed947d6a0482c2cd7d6af5a52a3063d;p=lhc%2Fweb%2Fwiklou.git
diff --git a/profileinfo.php b/profileinfo.php
index 15b292ac27..ecf69e50e1 100644
--- a/profileinfo.php
+++ b/profileinfo.php
@@ -1,27 +1,39 @@
-
+
-
- name()) . $extet ?>
+ |
+ name() ) . $extet ?>
|
- fmttime() ?> |
- time() / $totaltime * 100 ) ?> |
- memory() / $totalmemory * 100 ) ?> |
+ time() / self::$totaltime * 100 ) ?> |
+ memory() / self::$totalmemory * 100 ) ?> |
count() ?> |
- count() / $totalcount ), 2 ) ?>
- | time() / $this->count() ), 2 ) ?>
- | memory() / $this->count() / 1048576 ), 2 ) ?>
+ | 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 );
+ }
+ }
}
function name() {
@@ -141,46 +158,73 @@ class profile_point {
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($a, $b) {
+function compare_point( $a, $b ) {
global $sort;
- switch ($sort) {
+ switch ( $sort ) {
case "name":
- return strcmp($a->name(), $b->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", "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))
+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());
-if (isset($_REQUEST['filter']))
+$dbr = wfGetDB( DB_SLAVE );
+$res = $dbr->select( 'profiling', '*', array(), 'profileinfo.php', array( 'ORDER BY' => 'pf_name ASC' ) );
+
+if (isset( $_REQUEST['filter'] ) )
$filter = $_REQUEST['filter'];
-else $filter = '';
+else
+ $filter = '';
?>
-