From 3e4b32e18526e03b4801ef7f05e07430dcf67bfc Mon Sep 17 00:00:00 2001 From: Tim Starling Date: Sun, 19 Jun 2005 10:17:22 +0000 Subject: [PATCH] fixed checked-in conflict marker --- includes/Profiling.php | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/includes/Profiling.php b/includes/Profiling.php index 58026b02ea..25dfcb1e60 100755 --- a/includes/Profiling.php +++ b/includes/Profiling.php @@ -161,24 +161,6 @@ class Profiler { # The ugly double sprintf is to work around a PHP bug, # which has been fixed in recent releases. -<<<<<<< Profiling.php - return sprintf("%10s %s %s\n", trim(sprintf("%7.3f", $delta * 1000.0)), $space, $fname); - } - - function micro2Float($micro) { - list ($whole, $fractional) = explode(' ', $micro); - return (float) $whole + (float) $fractional; - } - - function microDelta($start, $end) { - return $this->micro2Float($end) - $this->micro2Float($start); - } - - function getFunctionReport() { - $width = 125; - $format = "%-". ($width -34)."s %6d %6.3f %6.3f %7.3f%% %6d (%6.3f-%6.3f) [%d]\n"; - $titleFormat = "%-". ($width -34)."s %9s %9s %9s %9s %6s\n"; -======= return sprintf( "%10s %s %s\n", trim( sprintf( "%7.3f", $delta * 1000.0 ) ), $space, $fname ); @@ -204,7 +186,6 @@ class Profiler { $nameWidth = $width - 65; $format = "%-{$nameWidth}s %6d %13.3f %13.3f %13.3f%% %9d (%13.3f -%13.3f) [%d]\n"; $titleFormat = "%-{$nameWidth}s %6s %13s %13s %13s %9s %14s %14s %9s\n"; ->>>>>>> 1.29.2.6 $prof = "\nProfiling data\n"; $prof .= sprintf($titleFormat, 'Name', 'Calls', 'Total', 'Each', '%', 'Mem'); $this->mCollated = array (); -- 2.20.1