| Index: trunk/phase3/includes/Profiling.php |
| — | — | @@ -161,24 +161,6 @@ |
| 162 | 162 | |
| 163 | 163 | # The ugly double sprintf is to work around a PHP bug, |
| 164 | 164 | # which has been fixed in recent releases. |
| 165 | | -<<<<<<< Profiling.php |
| 166 | | - return sprintf("%10s %s %s\n", trim(sprintf("%7.3f", $delta * 1000.0)), $space, $fname); |
| 167 | | - } |
| 168 | | - |
| 169 | | - function micro2Float($micro) { |
| 170 | | - list ($whole, $fractional) = explode(' ', $micro); |
| 171 | | - return (float) $whole + (float) $fractional; |
| 172 | | - } |
| 173 | | - |
| 174 | | - function microDelta($start, $end) { |
| 175 | | - return $this->micro2Float($end) - $this->micro2Float($start); |
| 176 | | - } |
| 177 | | - |
| 178 | | - function getFunctionReport() { |
| 179 | | - $width = 125; |
| 180 | | - $format = "%-". ($width -34)."s %6d %6.3f %6.3f %7.3f%% %6d (%6.3f-%6.3f) [%d]\n"; |
| 181 | | - $titleFormat = "%-". ($width -34)."s %9s %9s %9s %9s %6s\n"; |
| 182 | | -======= |
| 183 | 165 | return sprintf( "%10s %s %s\n", |
| 184 | 166 | trim( sprintf( "%7.3f", $delta * 1000.0 ) ), |
| 185 | 167 | $space, $fname ); |
| — | — | @@ -204,7 +186,6 @@ |
| 205 | 187 | $nameWidth = $width - 65; |
| 206 | 188 | $format = "%-{$nameWidth}s %6d %13.3f %13.3f %13.3f%% %9d (%13.3f -%13.3f) [%d]\n"; |
| 207 | 189 | $titleFormat = "%-{$nameWidth}s %6s %13s %13s %13s %9s %14s %14s %9s\n"; |
| 208 | | ->>>>>>> 1.29.2.6 |
| 209 | 190 | $prof = "\nProfiling data\n"; |
| 210 | 191 | $prof .= sprintf($titleFormat, 'Name', 'Calls', 'Total', 'Each', '%', 'Mem'); |
| 211 | 192 | $this->mCollated = array (); |
