X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=profileinfo.php;h=1549349bfd4e9916c1d0d065274864c3f5c77b59;hb=dd85820324735e88440c3663b85af8fbc93e677f;hp=36ef14dbb8868449a0cd342e535c7f9c4ba600b6;hpb=9af3c09e5c233ae5b0b466327759aba7852a187c;p=lhc%2Fweb%2Fwiklou.git diff --git a/profileinfo.php b/profileinfo.php index 36ef14dbb8..1549349bfd 100644 --- a/profileinfo.php +++ b/profileinfo.php @@ -1,28 +1,43 @@ - + Profiling data @@ -37,32 +52,46 @@ 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; + } Disabled

\n"; + echo ""; + exit( 1 ); +} -if (!$wgEnableProfileInfo) - die("disabled"); +$dbr = wfGetDB( DB_SLAVE ); -foreach (array("wgDBadminuser", "wgDBadminpassword", "wgDBserver", "wgDBname") as $var) - if ($$var === false) - die("AdminSettings.php not correct"); +if( !$dbr->tableExists( 'profiling' ) ) { + echo "

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

\n"; + echo "

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

\n"; + echo ""; + 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 { @@ -71,50 +100,62 @@ class profile_point { var $time; var $children; - function profile_point($name, $count, $time) { + static $totaltime, $totalmemory, $totalcount; + + function __construct( $name, $count, $time, $memory ) { $this->name = $name; $this->count = $count; $this->time = $time; + $this->memory = $memory; $this->children = array(); } - function add_child($child) { + function add_child( $child ) { $this->children[] = $child; } - function display($indent = 0.0) { - global $expand; - 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)); + if ( !$ex ) { + if ( count( $this->children ) ) { + $url = getEscapedProfileUrl( false, false, $expand + array( $this->name() => true ) ); $extet = " [+]"; - } else $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 = " [–]"; } ?> - fmttime() ?> - count() ?> - - name()) . $extet ?> + + 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 ); + } + } } function name() { @@ -128,44 +169,75 @@ 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() { + 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(profile_point $a, profile_point $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", "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_name - FROM 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 = ''; ?> -
+

@@ -174,60 +246,83 @@ else $filter = '';

- +
- - - + + + + + + + + + $_filter ? $_filter : $filter, + 'sort' => $_sort ? $_sort : $sort, + 'expand' => implode( ',', array_keys( $_expand ) ) + ) ) + ); } $points = array(); +$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); - $totaltime += $next->time(); - if ($last !== false) { - if (preg_match("/^".preg_quote($last->name(), "/")."/", $next->name())) { +foreach( $res as $o ) { + $next = new profile_point( $o->pf_name, $o->pf_count, $o->pf_time, $o->pf_memory ); + if( $next->name() == '-total' ) { + 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() ) ) { $last->add_child($next); continue; } } $last = $next; - $points[] = $next; + if ( preg_match( "/^query: /", $next->name() ) || preg_match( "/^query-m: /", $next->name() ) ) { + $sqltotal += $next->time(); + $queries[] = $next; + } else { + $points[] = $next; + } } -usort($points, "compare_point"); +$s = new profile_point( "SQL Queries", 0, $sqltotal, 0, 0 ); +foreach ( $queries as $q ) + $s->add_child($q); +$points[] = $s; + +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 ); } ?>
">Time">Count">NameNameTime (%)Memory (%)CountCalls/reqms/callkb/callms/reqkb/req
-

Total time:

- +

Total time:

+

Total memory:

-