X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=profileinfo.php;h=37e7a04a8e22d2dc14d7961d934d681a5b708aa0;hb=61cbf1bf9a13068794431ded4c78ac59197536ee;hp=bf3cd0f81f3a9a980e10fe9336304d048a83e32f;hpb=7934561780072abd16c2a4d124e0025332348730;p=lhc%2Fweb%2Fwiklou.git diff --git a/profileinfo.php b/profileinfo.php index bf3cd0f81f..37e7a04a8e 100644 --- a/profileinfo.php +++ b/profileinfo.php @@ -1,27 +1,43 @@ - + Profiling data @@ -55,30 +71,27 @@ Disabled

\n"; + echo ""; 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( 'profileinfo' ) ) { + echo "

No 'profileinfo' 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 { @@ -87,7 +100,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; @@ -95,49 +110,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"); - - $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)); + function display( $expand, $indent = 0.0 ) { + usort( $this->children, 'compare_point' ); + + $ex = isset( $expand[$this->name()] ); + + 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 = " [–]"; } ?> - name()) . $extet ?> + name() ) . $extet ?> - time() / $totaltime * 100 ) ?> - memory() / $totalmemory * 100 ) ?> + time() / self::$totaltime * 100 ) ?> + memory() / self::$totalmemory * 100 ) ?> count() ?> callsPerRequest() ), 2 ) ?> timePerCall() ), 2 ) ?> memoryPerCall() / 1024 ), 2 ) ?> - time() / $totalcount ), 2 ) ?> - memory() / $totalcount / 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 ); } } } @@ -159,38 +175,35 @@ class profile_point { } 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) { + 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": @@ -210,26 +223,21 @@ function compare_point($a, $b) { } } -$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 = ''; ?> -
+

@@ -240,31 +248,35 @@ else $filter = ''; - - - - - - - - - + + + + + + + + + $_filter ? $_filter : $filter, + 'sort' => $_sort ? $_sort : $sort, + 'expand' => implode( ',', array_keys( $_expand ) ) + ) ) + ); } $points = array(); @@ -272,21 +284,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 { @@ -294,29 +306,23 @@ 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/reqNameTime (%)Memory (%)CountCalls/reqms/callkb/callms/reqkb/req
-

Total time:

-

Total memory:

- +

Total time:

+

Total memory: