(bug 13718) Return the proper continue parameter for cmsort=timestamp

[lhc/web/wiklou.git] / profileinfo.php

diff --git a/profileinfo.php b/profileinfo.php
index c7305b3..9290ad4 100644 (file)
--- a/profileinfo.php
+++ b/profileinfo.php
@@ -36,7 +36,7 @@
                padding-right: 0.5em;
        }
 
-       td.time, td.count {
+       td.time, td.timep, td.count, td.cpr {
                text-align: right;
        }
 </style>
@@ -46,24 +46,22 @@
 
 $wgDBadminuser = $wgDBadminpassword = $wgDBserver = $wgDBname = $wgEnableProfileInfo = false;
 
-define("MEDIAWIKI", 1);
-if ( isset( $_REQUEST['GLOBALS'] ) ) {
-       print $GLOBALS;
-       echo '<a href="http://www.hardened-php.net/index.76.html">$GLOBALS overwrite vulnerability</a>';
-       die( -1 );
-}
-
-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']))
@@ -88,7 +86,7 @@ class profile_point {
        }
 
        function display($indent = 0.0) {
-               global $expand;
+               global $expand, $totaltime, $totalcount;
                usort($this->children, "compare_point");
 
                $extet = '';
@@ -111,7 +109,9 @@ class profile_point {
                ?>
                <tr>
                <td class="time"><tt><?php echo $this->fmttime() ?></tt></td>
+               <td class="timep"><?php echo wfPercent( $this->time() / $totaltime * 100 ) ?></td>
                <td class="count"><?php echo $this->count() ?></td>
+               <td class="cpr"><?php echo round( sprintf( '%.2f',$this->count() /      $totalcount ), 2 ) ?>
                <td class="name" style="padding-left: <?php echo $indent ?>em">
                        <?php echo htmlspecialchars($this->name()) . $extet ?>
                </td>
@@ -157,13 +157,13 @@ 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
        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'];
@@ -182,11 +182,14 @@ else      $filter = '';
 <table cellspacing="0">
 <tr id="top">
 <th><a href="<?php echo makeurl(false, "time") ?>">Time</a></th>
+<th>Time (%)</th>
 <th><a href="<?php echo makeurl(false, "count") ?>">Count</a></th>
+<th>Avg calls per request</th>
 <th><a href="<?php echo makeurl(false, "name") ?>">Name</a></th>
 </tr>
 <?php
 $totaltime = 0.0;
+$totalcount = 0;
 
 function makeurl($_filter = false, $_sort = false, $_expand = false) {
        global $filter, $sort, $expand;
@@ -207,7 +210,10 @@ $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( $next->name() == '-total' ) {
+               $totaltime = $next->time();
+               $totalcount = $next->count();
+       }
        if ($last !== false) {
                if (preg_match("/^".preg_quote($last->name(), "/")."/", $next->name())) {
                        $last->add_child($next);