diff options
| author | Andrey Andreev <narf@bofh.bg> | 2012-04-27 11:15:47 +0200 |
|---|---|---|
| committer | Andrey Andreev <narf@bofh.bg> | 2012-04-27 11:15:47 +0200 |
| commit | 5815dba069428514ce39e745328a898fc877773f (patch) | |
| tree | 9ba5c1dc7bef0458c5f89e573f1b2acf05f3c688 /system/core/Benchmark.php | |
| parent | 9c9591c9b4a1d7ac412f7a85aeb5c92f50aa3490 (diff) | |
| parent | ced2c9ab41450cb632c042730604111ec2a24e1f (diff) | |
Merge upstream branch
Diffstat (limited to 'system/core/Benchmark.php')
| -rwxr-xr-x | system/core/Benchmark.php | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/system/core/Benchmark.php b/system/core/Benchmark.php index f6b634deb..c17e95a19 100755 --- a/system/core/Benchmark.php +++ b/system/core/Benchmark.php @@ -46,7 +46,7 @@ class CI_Benchmark { * * @var array */ - public $marker = array(); + public $marker = array(); // -------------------------------------------------------------------- @@ -61,7 +61,7 @@ class CI_Benchmark { */ public function mark($name) { - $this->marker[$name] = microtime(); + $this->marker[$name] = microtime(TRUE); } // -------------------------------------------------------------------- @@ -93,13 +93,10 @@ class CI_Benchmark { if ( ! isset($this->marker[$point2])) { - $this->marker[$point2] = microtime(); + $this->marker[$point2] = microtime(TRUE); } - list($sm, $ss) = explode(' ', $this->marker[$point1]); - list($em, $es) = explode(' ', $this->marker[$point2]); - - return number_format(($em + $es) - ($sm + $ss), $decimals); + return number_format($this->marker[$point2] - $this->marker[$point1], $decimals); } // -------------------------------------------------------------------- |