aboutsummaryrefslogtreecommitdiffstats
path: root/includes/Profiling.php
diff options
context:
space:
mode:
authornobody <nobody@localhost>2006-01-05 23:36:45 +0000
committernobody <nobody@localhost>2006-01-05 23:36:45 +0000
commit4ce70280face928c604c4300fd2ba6fdc78243da (patch)
tree3b2f616b592484fcd8bf9b70ea4a062cd5ac64fc /includes/Profiling.php
parent9018faf3a776fffd61bbb9a7516da6ae8bf55f55 (diff)
parentb2a8013a4893454f32dc13bd253e141d7fef2f35 (diff)
downloadmediawikicore-4ce70280face928c604c4300fd2ba6fdc78243da.tar.gz
mediawikicore-4ce70280face928c604c4300fd2ba6fdc78243da.zip
This commit was manufactured by cvs2svn to create tag 'REL1_5_5'.1.5.5
Diffstat (limited to 'includes/Profiling.php')
-rwxr-xr-xincludes/Profiling.php10
1 files changed, 6 insertions, 4 deletions
diff --git a/includes/Profiling.php b/includes/Profiling.php
index 770f39fedd3b..2fe5adab3b75 100755
--- a/includes/Profiling.php
+++ b/includes/Profiling.php
@@ -245,10 +245,12 @@ class Profiler {
$subcalls = $this->calltreeCount($this->mStack, $index);
if (!preg_match('/^-overhead/', $fname)) {
- # Adjust for profiling overhead
- $elapsed -= $overheadInternal;
- $elapsed -= ($subcalls * $overheadTotal);
- $memory -= ($subcalls * $overheadMemory);
+ # Adjust for profiling overhead (except special values with elapsed=0
+ if ( $elapsed ) {
+ $elapsed -= $overheadInternal;
+ $elapsed -= ($subcalls * $overheadTotal);
+ $memory -= ($subcalls * $overheadMemory);
+ }
}
if (!array_key_exists($fname, $this->mCollated)) {