Update for he.

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

diff --git a/profileinfo.php b/profileinfo.php
index e330a6e..032df3f 100644 (file)
--- a/profileinfo.php
+++ b/profileinfo.php
@@ -121,22 +121,24 @@ class profile_point {
                }
                ?>
                <tr>
-               <td class="name" style="padding-left: <?php echo $indent ?>em">
+               <td class="name" style="padding-left: <?php echo $indent ?>em;">
                        <?php echo htmlspecialchars($this->name()) . $extet ?>
                </td>
-               <td class="timep"><?php echo wfPercent( $this->time() / $totaltime * 100 ) ?></td>
-               <td class="memoryp"><?php echo wfPercent( $this->memory() / $totalmemory * 100 ) ?></td>
+               <td class="timep"><?php echo @wfPercent( $this->time() / $totaltime * 100 ) ?></td>
+               <td class="memoryp"><?php echo @wfPercent( $this->memory() / $totalmemory * 100 ) ?></td>
                <td class="count"><?php echo $this->count() ?></td>
                <td class="cpr"><?php echo round( sprintf( '%.2f', $this->callsPerRequest() ), 2 ) ?></td>
                <td class="tpc"><?php echo round( sprintf( '%.2f', $this->timePerCall() ), 2 ) ?></td>
-               <td class="mpc"><?php echo round( sprintf( '%.2f' ,$this->memoryPerCall() / 1048576 ), 2 ) ?></td>
-               <td class="tpr"><?php echo round( sprintf( '%.2f', $this->time() / $totalcount ), 2 ) ?></td>
-               <td class="mpr"><?php echo round( sprintf( '%.2f' ,$this->memory() / $totalcount / 1048576 ), 2 ) ?></td>
+               <td class="mpc"><?php echo round( sprintf( '%.2f' ,$this->memoryPerCall() / 1024 ), 2 ) ?></td>
+               <td class="tpr"><?php echo @round( sprintf( '%.2f', $this->time() / $totalcount ), 2 ) ?></td>
+               <td class="mpr"><?php echo @round( sprintf( '%.2f' ,$this->memory() / $totalcount / 1024 ), 2 ) ?></td>
                </tr>
                <?php
-               if ($ex)
-                       foreach ($this->children as $child)
+               if ($ex) {
+                       foreach ($this->children as $child) {
                                $child->display($indent + 2);
+                       }
+               }
        }
 
        function name() {
@@ -235,17 +237,17 @@ else      $filter = '';
 </p>
 </form>
 
-<table cellspacing="0" border="1px">
+<table cellspacing="0" border="1">
 <tr id="top">
 <th><a href="<?php echo makeurl(false, "name") ?>">Name</a></th>
 <th><a href="<?php echo makeurl(false, "time") ?>">Time (%)</a></th>
 <th><a href="<?php echo makeurl(false, "memory") ?>">Memory (%)</a></th>
 <th><a href="<?php echo makeurl(false, "count") ?>">Count</a></th>
-<th><a href="<?php echo makeurl(false, "calls_per_req") ?>">Calls/request</a></th>
+<th><a href="<?php echo makeurl(false, "calls_per_req") ?>">Calls/req</a></th>
 <th><a href="<?php echo makeurl(false, "time_per_call") ?>">ms/call</a></th>
 <th><a href="<?php echo makeurl(false, "memory_per_call") ?>">kb/call</a></th>
-<th><a href="<?php echo makeurl(false, "time_per_req") ?>">ms/request</a></th>
-<th><a href="<?php echo makeurl(false, "memory_per_req") ?>">kb/request</a></th>
+<th><a href="<?php echo makeurl(false, "time_per_req") ?>">ms/req</a></th>
+<th><a href="<?php echo makeurl(false, "memory_per_req") ?>">kb/req</a></th>
 </tr>
 <?php
 $totaltime = 0.0;
@@ -283,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 {
@@ -308,7 +310,7 @@ foreach ($points as $point) {
 </table>
 
 <p>Total time: <tt><?php printf("%5.02f", $totaltime) ?></tt></p>
-<p>Total memory: <tt><?php printf("%5.02f", $totalmemory / 1048576 ) ?></tt></p>
+<p>Total memory: <tt><?php printf("%5.02f", $totalmemory / 1024 ) ?></tt></p>
 <?php
 
 mysql_free_result($res);